backport fix issue #171