Fix to be in sync with RESTful service