Fix callback checking