Fixes issue #125