Fix Issue #222