Fixed validation