fixing datastore checks