Fix for the copy indexes reverted commit