Bug fix in WF constructor