Fixed problem that loads incorrect datasotre class