fix in room handling