Fix rest service