Reworking index locking