Fix for REST service.