Fixed double loading bug for maps