Fix Rest API