WCP-222 : Fixed bug with validation