bugfixes
[#51757263]