Fix issue #171