How about this to fix datastore assignments?