port to yara 1.7