Fixes issue #162