Fix validation of unique once in 2.1.x