Fix: remove elements index