Fix pairing commands with response