Issue #1451: Fix a regression caused by #1388

Signed-off-by: Anton Kovalyov <anton@kovalyov.net>