Fix room object iteration