bugfixes
[#51235205]