Fixed bugs when changing room