fix room changing