diff --git a/src/driver/amgc_driver_ctx.c b/src/driver/amgc_driver_ctx.c
index d2bef3f..66e4f2f 100644
--- a/src/driver/amgc_driver_ctx.c
+++ b/src/driver/amgc_driver_ctx.c
@@ -80,7 +80,7 @@ static struct amgc_driver_ctx_impl * amgc_driver_ctx_alloc(
 	size =  sizeof(struct amgc_driver_ctx_alloc);
 	size += (nunits+1)*sizeof(const char *);
 
-	if (!(ictx = calloc(size,1)))
+	if (!(ictx = calloc(1,size)))
 		return 0;
 
 	if (cctx)
diff --git a/src/driver/amgc_unit_ctx.c b/src/driver/amgc_unit_ctx.c
index eb65898..6f08ad7 100644
--- a/src/driver/amgc_unit_ctx.c
+++ b/src/driver/amgc_unit_ctx.c
@@ -118,7 +118,7 @@ int amgc_get_unit_ctx(
 
 	amgc_init_cparser_unit();
 
-	if (!dctx || !(ctx = calloc(sizeof(*ctx),1)))
+	if (!dctx || !(ctx = calloc(1,sizeof(*ctx))))
 		return -1;
 
 	if (strcmp(path,"-"))