Fix callback context