Fix validation with new delay option