diff-mode fix