diff --git a/layers.personal/orgtools/local/ob-tikz/ob-tikz.el b/layers.personal/orgtools/local/ob-tikz/ob-tikz.el
index 0ad28a6..8ed47e0 100644
--- a/layers.personal/orgtools/local/ob-tikz/ob-tikz.el
+++ b/layers.personal/orgtools/local/ob-tikz/ob-tikz.el
@@ -140,7 +140,7 @@ This function is called by `org-babel-execute-src-block'."
     (with-temp-file (concat in-file ".tex") 
       (insert (tikz-script format 
 			   (tikz-get-value-by-name 'tikz-libs
-						   (mapcar #'cdr (org-babel-get-header params :var)))
+                                 (org-babel--get-vars params))
 			   (org-babel-expand-body:generic
 			    body params 
 			    (org-babel-variable-assignments:tikz params)))))
@@ -159,7 +159,7 @@ Tikz does not support sessions"
 (defun org-babel-variable-assignments:tikz (params)
   "Return list of tikz statements assigning the block's variables"
   (mapcar #'org-babel-tikz-var-to-tikz
-	  (mapcar #'cdr (org-babel-get-header params :var))))
+          (org-babel--get-vars params)))
 
 (defun tikz-get-value-by-name (name vpairs)
   (let ((vp (assoc name vpairs)))