Fix the callback calling