WF-1682 - Fixed