Fix Issue #238