Fixed issue #1