Fixing Issue #343