WF-1643, WF-1646 Fixed