Working on fix need to load twice