Fix issue #17.