Fix Issue #164