Fix argument order
Fix response values