Fix the fix for Issue #1479