Fixed Issue #349