Fix callback bug