Fixes issue #114