Correctly handle indexes on pump