Fix issue #9.