fix datastore initialization