Fixing clone indexes via @btpoe