Index Extension - Fix backward compatibility

This should fix the backward bytecode compatibility issues introduced by the INDEX extension.