Fix callback invocation