Fixing Issue #457