Fixed Issue #171