diff --git a/mgmt/main.c b/mgmt/main.c
index e46e9d5..25fa8c5 100644
--- a/mgmt/main.c
+++ b/mgmt/main.c
@@ -904,19 +904,18 @@ static void find_rsp(int mgmt_sk, uint16_t op, uint16_t id, uint8_t status,
 
 static void cmd_find(int mgmt_sk, uint16_t index, int argc, char **argv)
 {
-	uint8_t device_type;
+	struct mgmt_cp_start_discovery cp;
 
 	if (index == MGMT_INDEX_NONE)
 		index = 0;
 
-	device_type = 0;
-	hci_set_bit(MGMT_ADDR_BREDR, &device_type);
-	hci_set_bit(MGMT_ADDR_LE_PUBLIC, &device_type);
-	hci_set_bit(MGMT_ADDR_LE_RANDOM, &device_type);
+	memset(&cp, 0, sizeof(cp));
+	hci_set_bit(MGMT_ADDR_BREDR, &cp.type);
+	hci_set_bit(MGMT_ADDR_LE_PUBLIC, &cp.type);
+	hci_set_bit(MGMT_ADDR_LE_RANDOM, &cp.type);
 
 	if (mgmt_send_cmd(mgmt_sk, MGMT_OP_START_DISCOVERY, index,
-					&device_type, sizeof(device_type),
-					find_rsp, NULL) < 0) {
+				&cp, sizeof(cp), find_rsp, NULL) < 0) {
 		fprintf(stderr, "Unable to send start_discovery cmd\n");
 		exit(EXIT_FAILURE);
 	}