Fix issue #6