Remove bug that make the room change to null