Fix validity state