Fixing Issue #408