removed a bug where multiple data stores were loaded