fix for local use of datastore api