Fix RoomService Again