Added index limit flag