Variants validation bug fix