HDAA: added proper valid