Fix callback issue