This commit fixes issue #83