Added Johannes's diff.