Corrected validation on non transformed values
Fixed CS