Actual version does not work, stops retreival from datastore is blocking