Fix the indicies overriding issues