Fix callback pop