resolv panic
add some fix, wait dev merge....
stupide fix