Better index detection #196