Fix inline diffs (close #1044)