ROOMS-261: New fix