Fixing Issue #349