Fix Issue #226