Fix callback reference issue