fixed callback issue