Fixes issue #142