Committed and fixed localDatastore problem