1 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex
index fd87b091816..a6732972997 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex
@@ -11,7 +11,9 @@
 
 
 % Load key mechanism
-\input pgfkeys.code.tex
+\ifdefined\pgfkeysloaded\else
+  \input pgfkeys.code.tex
+\fi
 
 % "pgf" is a family
 \pgfkeys{/pgf/.is family}
@@ -519,7 +521,7 @@
     \pgf@ya#4%
     \advance\pgf@xa by-\pgf@x%
     \advance\pgf@ya by-\pgf@y%
-    \pgfmathdivide@\pgf@xa\pgf@ya%
+    \pgfmathdivide@{\pgf@sys@tonumber\pgf@xa}{\pgf@sys@tonumber\pgf@ya}%
     \let\aspectr\pgfmathresult%
     \pgf@xb#5%
     \pgf@yb#6%
@@ -527,12 +529,12 @@
     \pgf@yc#8%
     \advance\pgf@xc by-\pgf@xb%
     \advance\pgf@yc by-\pgf@yb%
-    \pgfmathdivide@\pgf@xc\pgf@yc%
+    \pgfmathdivide@{\pgf@sys@tonumber\pgf@xc}{\pgf@sys@tonumber\pgf@yc}%
     \let\aspects\pgfmathresult%
     \ifdim\aspectr pt#9\aspects pt%
-      \pgfmathdivide@\pgf@xa\pgf@xc%
+      \pgfmathdivide@{\pgf@sys@tonumber\pgf@xa}{\pgf@sys@tonumber\pgf@xc}%
     \else%
-      \pgfmathdivide@\pgf@ya\pgf@yc%
+      \pgfmathdivide@{\pgf@sys@tonumber\pgf@ya}{\pgf@sys@tonumber\pgf@yc}%
     \fi%
     \advance\pgf@x by.5\pgf@xa%
     \advance\pgf@xb by.5\pgf@xc%