Fix double loading bug