Fixed double loading indices issue