FIX bug with indexing (rebase failure)