roomservice: More fix