Fixing Issue #321