fix gateway_command