Index special case fix