Fixes issue #118