Issue fixed on loading