Rooms fix 2