Fix issue #6.