fix callback-errors
fix conflict