Fixed validation flow