WCP-114 : Created test case to replicate issue, then found the issue and fixed it.