Fix callback removal.