Fix for too many parameters in submit_return.