Fix room creation