diff --git a/kit/funcube.c b/kit/funcube.c
index f609d26f3..6bad87b8d 100644
--- a/kit/funcube.c
+++ b/kit/funcube.c
@@ -233,14 +233,16 @@ int funcube_init(RIG *rig)
     hamlib_port_t *rp = &rig->state.rigport;
     struct funcube_priv_data *priv;
 
-    priv = (struct funcube_priv_data *)calloc(sizeof(struct funcube_priv_data), 1);
+    rig->state.priv = (struct funcube_priv_data *)calloc(sizeof(struct funcube_priv_data), 1);
 
-    if (!priv)
+    if (!rig->state.priv)
     {
         /* whoops! memory shortage! */
         return -RIG_ENOMEM;
     }
 
+    priv = rig->state.priv;
+
     priv->freq = 0;
 
     rp->parm.usb.vid = VID;
@@ -252,8 +254,6 @@ int funcube_init(RIG *rig)
     rp->parm.usb.vendor_name = VENDOR_NAME;
     rp->parm.usb.product = PRODUCT_NAME;
 
-    rig->state.priv = (void *)priv;
-
     return RIG_OK;
 }