Move fixup before line offset change