Fixed - WF-1728