[#54432124] fixes