fix to work with 2.2 datastore