fixing handing on loading