bug fix in client datastore mixin utility