fixed bug in data store