Validation tweak