Removed possible crashing from moving between rooms