Fixing bug where multiple data containers were created.