Merged with runoff.c fix (issue #123).