diff --git a/CMakeLists.txt b/CMakeLists.txt
index 876201a..ba93029 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(blt-gp VERSION 0.1.12)
+project(blt-gp VERSION 0.1.13)
 
 include(CTest)
 
diff --git a/include/blt/gp/stack.h b/include/blt/gp/stack.h
index bb0bffa..a356ad9 100644
--- a/include/blt/gp/stack.h
+++ b/include/blt/gp/stack.h
@@ -130,7 +130,7 @@ namespace blt::gp
                 if (stack.empty())
                     return;
                 if (size_ < stack.bytes_stored + bytes_stored)
-                    expand(stack.bytes_stored + bytes_stored);
+                    expand(stack.bytes_stored + size_);
                 std::memcpy(data_ + bytes_stored, stack.data_, stack.bytes_stored);
                 bytes_stored += stack.bytes_stored;
             }
@@ -140,7 +140,7 @@ namespace blt::gp
                 if (bytes == 0)
                     return;
                 if (size_ < bytes + bytes_stored)
-                    expand(bytes + bytes_stored);
+                    expand(bytes + size_);
                 std::memcpy(data_ + bytes_stored, stack.data_ + (stack.bytes_stored - bytes), bytes);
                 bytes_stored += bytes;
             }
@@ -150,7 +150,7 @@ namespace blt::gp
                 if (bytes == 0 || data == nullptr)
                     return;
                 if (size_ < bytes + bytes_stored)
-                    expand(bytes + bytes_stored);
+                    expand(bytes + size_);
                 std::memcpy(data_ + bytes_stored, data, bytes);
                 bytes_stored += bytes;
             }
@@ -196,7 +196,7 @@ namespace blt::gp
                     BLT_ABORT(("Not enough bytes in stack to reference " + std::to_string(size) + " bytes requested but " + std::to_string(bytes) +
                                " bytes stored!").c_str());
 #endif
-                return *reinterpret_cast<NO_REF*>(data_ + bytes_stored - size);
+                return *reinterpret_cast<NO_REF*>(data_ + (bytes_stored - size));
             }
             
             void pop_bytes(blt::size_t bytes)
@@ -298,15 +298,15 @@ namespace blt::gp
             
             void* allocate_bytes_for_size(blt::size_t bytes)
             {
-                auto aligned_ptr = get_aligned_pointer(bytes);
+                auto used_bytes = aligned_size(bytes);
+                auto aligned_ptr = get_aligned_pointer(used_bytes);
                 if (aligned_ptr == nullptr)
                 {
-                    expand(size_ + bytes);
-                    aligned_ptr = get_aligned_pointer(bytes);
+                    expand(size_ + used_bytes);
+                    aligned_ptr = get_aligned_pointer(used_bytes);
                 }
                 if (aligned_ptr == nullptr)
                     throw std::bad_alloc();
-                auto used_bytes = aligned_size(bytes);
                 bytes_stored += used_bytes;
                 return aligned_ptr;
             }
diff --git a/src/tree.cpp b/src/tree.cpp
index 46cd827..96198c0 100644
--- a/src/tree.cpp
+++ b/src/tree.cpp
@@ -135,8 +135,10 @@ namespace blt::gp
                 {
                     create_indent(out, indent, pretty_print);
                     if (program.is_static(v.id))
+                    {
                         program.get_print_func(v.id)(out, reversed);
-                    else
+                        reversed.pop_bytes(stack_allocator::aligned_size(v.type_size));
+                    } else
                         out << name;
                     out << return_type << end_indent(pretty_print);
                 } else