Fixes issue #195