Refix the fix (1-based indexing)