* Fix issue #6