Fix number of arguments passed to _on_return callback