Fix Issue #161