This commit fixes issue #1