Another fix to room connectivity