Fix Issue #349