some fix
Merge branch 'xxh'