fix loading problems