Fix issue #9