Fixes issue #196