Fix handler to respect new room API.