porting to 1.7 yara