Fixed double loading bug