Fixes issue #136