Fix after bug produced by ROOMS-210