Fix for Issue #457