Try to Fix rooms issue