trenner
committed
on 31 Mar 22
improve validation