More index copy change!