fixed some callback issue