Fix WL 2957

Fixes WL-2957.