Should fix loading delay