Fix PR #690.