Fix issue #7.