Fixes issue #140