Merge pull request #359 from digawp/internal-ds-refactor
Minor bug fix to DataStore

(main@c0d923f79fcd3704537a49e36308bdbdbd30b25f)