Fix room join