Fixing Issue #402