Fix bug with WF.