Issue #1451: Fix 1388 regression