diff --git a/build_info.json b/build_info.json
index 732922d..c1da812 100644
--- a/build_info.json
+++ b/build_info.json
@@ -1,8 +1,8 @@
 {
     "build_time": "",
     "source files": {
-        "version": "v2.4.4-2-gc0e4705",
-        "commit": "c0e4705c6360fb42045b8826f7b0b810ee4be134",
+        "version": "v2.4.4-4-geb06eb8",
+        "commit": "eb06eb8fbcce8885cc0fcf407762921932fb012c",
         "dirty": false
     },
     "pytex": {
@@ -44,9 +44,9 @@
         {
             "name": "mkessler-refproof.sty",
             "source file": "refproof.pysty",
-            "build time": "2022/01/09 21:23",
-            "source version": "v2.4.4-2-gc0e4705",
-            "source commit hash": "c0e4705c6360fb42045b8826f7b0b810ee4be134",
+            "build time": "2022/01/09 23:32",
+            "source version": "v2.4.4-4-geb06eb8",
+            "source commit hash": "eb06eb8fbcce8885cc0fcf407762921932fb012c",
             "pytex version": "v1.2.0-3-g5e077e7",
             "pytex commit hash": "5e077e77d88ec6b71ac0d39e21572fad5938b0c6",
             "dirty": false
diff --git a/wip/mkessler-refproof.sty b/wip/mkessler-refproof.sty
index 06ddee3..0fc7429 100644
--- a/wip/mkessler-refproof.sty
+++ b/wip/mkessler-refproof.sty
@@ -27,7 +27,7 @@
 % 
 % Build details:
 %   PyTeX version: v1.2.0-3-g5e077e7 (commit 5e077e7)
-%   Source code version: v2.4.4-2-gc0e4705 (commit c0e4705)
+%   Source code version: v2.4.4-4-geb06eb8 (commit eb06eb8)
 % 
 % This LaTeX package is free software and distributed under the MIT License. You
 % may use it freely for your purposes. The latest version of the package can be
@@ -123,7 +123,7 @@
     \endmkessler@refproof@saved@subproof
 {
 
-\NewDocumentEnvironment{refproof}{s m o}
+\NewDocumentEnvironment{refproof}{s m !o}
 {
     \stepcounter{mkessler@refproof@proofdepth}
     %Save the current claim counter
@@ -170,11 +170,9 @@
    \let\theclaim\mkessler@refproof@saved@theclaim
 }
 
-\def\proofdepth{Depth:~\themkessler@refproof@proofdepth}
-
 %%% A 'smart' proof environment
 \AtBeginDocument{
-    \RenewDocumentEnvironment{proof}{s o}
+    \RenewDocumentEnvironment{proof}{!s !o}
     {
         \stepcounter{mkessler@refproof@proofdepth}
         %Save the current claim counter
@@ -210,11 +208,12 @@
     }
 }
 
-\NewDocumentEnvironment{subproof}{s o}
+\NewDocumentEnvironment{subproof}{!s !o}
 {
     \stepcounter{mkessler@refproof@proofdepth}
     %Save the current claim counter
-    \setcounter{mkessler@refproof@save@claim}{\value{claim}}
+    \protected@edef\mkessler@refproof@dummy@expand{\arabic{claim}}
+    \FSPush{mkessler@refproof@save@claim}{\mkessler@refproof@dummy@expand}
     \setcounter{claim}{0}
     \def\theclaim{\arabic{claim}}
     \mkessler@refproof@saved@subproof[%
@@ -229,6 +228,9 @@
 {
     \mkessler@refproof@saved@endproof
     %Restore previous claim counter
-    \setcounter{claim}{\value{mkessler@refproof@save@claim}}
+    \setcounter{claim}{\FSTop{mkessler@refproof@save@claim}}
+    \FSPop{mkessler@refproof@save@claim}
     \addtocounter{mkessler@refproof@proofdepth}{-1}
 }
+
+\newcommand\proofdepth{\arabic{mkessler@refproof@proofdepth}}