Index: src/AST/Convert.cpp
===================================================================
--- src/AST/Convert.cpp	(revision a7d50b6989318c3023acc4b28d629c5286426c24)
+++ src/AST/Convert.cpp	(revision c786e1d51c01a7bfb6e36342d9cc3c0d40f6b820)
@@ -10,6 +10,6 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 16:59:00 2019
-// Update Count     : 6
+// Last Modified On : Tue May 28 12:00:00 2019
+// Update Count     : 7
 //
 
@@ -1341,5 +1341,7 @@
 		if ( ! old ) return nullptr;
 		old->accept(*this);
-		return strict_dynamic_cast< NewT * >( node );
+		ast::Node * ret = node;
+		node = nullptr;
+		return strict_dynamic_cast< NewT * >( ret );
 	}
 
@@ -1354,4 +1356,5 @@
 			a->accept( *this );
 			ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
+			node = nullptr;
 		}
 		return ret;
@@ -1877,7 +1880,7 @@
 			GET_LABELS_V(old->labels)
 		);
+		cache.emplace( old, stmt );
+		stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
 		this->node = stmt;
-		cache.emplace( old, this->node );
-		stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
 	}