Fix rest service issue