Fix the error caused by the callback in loop
Merge remote-tracking branch 'origin/pr/61'

[#80444730]