Fixed WF-1721

Fixed WF-1721