Fix Issue #234