Fix roomservice #2