Fix issue #8.