Quick fix for logic change missed in #1354