Fixed to work with the new client