Fixed - WF-1725