fixing diffs