Fixed major issue with rest client