Fixes issue #167