Fixed bug in datastore stub