This commit fixes issue #5