Re-add mistakenly removed index offsets