diffs fixed