fixed double loading bug