This commit fixes issue #2