fixed for using the REST implementation