Fixed issue with rooms