Fixed - WF-1748