PLA-1740 double validation added