Fixes WFE-745