WF-1658: Resolved the issue