#233911 fix on return args