diff --git a/IDEHelper/Compiler/BfStmtEvaluator.cpp b/IDEHelper/Compiler/BfStmtEvaluator.cpp
index 61f86152..bba7233b 100644
--- a/IDEHelper/Compiler/BfStmtEvaluator.cpp
+++ b/IDEHelper/Compiler/BfStmtEvaluator.cpp
@@ -1546,7 +1546,7 @@ BfLocalVariable* BfModule::HandleVariableDeclaration(BfVariableDeclaration* varD
 			unresolvedType = initValue.mType;
 		resolvedType = unresolvedType;
 
-		if (initValue.IsTempAddr())
+		if ((initValue.IsTempAddr()) && (!localDef->mAddr) && (initValue.mType == resolvedType))
 		{
 			// Take over value
 			localDef->mAddr = initValue.mValue;