Fixing Issue #401