Fixes issue #171