* Fixed issue #1