Fix commands and replies mismatch.