Fix the room conditional?