Diff invariant fix