Fixes issue #138