Fixes issue #128