Fixes issue #161