Fix unassigned WO issue