Fixed validation problem