Fix response commands
Fix response commands