Fixes a severe bug in 8.5.0.

Bugfixes