Fix return params
Fix return params