Fixes WFE-973.