Fix for multiple rooms