Fixes issue #134