Fix issue #8