Wip/fix 1632

Fixes #16322

cc @topping no worries about the regression.  It was a one line fix.

Review by @eed3si9n