Fix roomservice