Added conditional for current room in case no is is present