Added index for backward compat (2.6)