Fix issue #18.