hotfix - bug in datastore with new AF