Fixes issue #163