WPC ISSUE-14 solutions