Fixed callback invocation