fixing load stuff