Bug fix for WF 3.0