Rooms handling fixed.