Revert of wrong index fixing.