Issue #1451: Fix a regression caused by #1388