Work on issue #18.