Fix to load logic