Bug fixed on loading