diff --git a/src/Handlebars/Helper/IfHelper.php b/src/Handlebars/Helper/IfHelper.php
index e5de136..529a706 100644
--- a/src/Handlebars/Helper/IfHelper.php
+++ b/src/Handlebars/Helper/IfHelper.php
@@ -57,15 +57,23 @@ class IfHelper implements Helper
         }
 
         if ($tmp) {
+            $context->push($context->last());
+            
             $template->setStopToken('else');
             $buffer = $template->render($context);
             $template->setStopToken(false);
             $template->discard($context);
+            
+            $context->pop();
         } else {
+            $context->push($context->last());
+            
             $template->setStopToken('else');
             $template->discard($context);
             $template->setStopToken(false);
             $buffer = $template->render($context);
+            
+            $context->pop();
         }
 
         return $buffer;