bugfix in how we process diffs