several callback fixs