Fix for integration with advanced rest client