EAVL-34 Added zero detection to validation