diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp
index f6318752..5fa48e8a 100644
--- a/IDEHelper/Compiler/BfExprEvaluator.cpp
+++ b/IDEHelper/Compiler/BfExprEvaluator.cpp
@@ -16217,8 +16217,14 @@ void BfExprEvaluator::InjectMixin(BfAstNode* targetSrc, BfTypedValue target, boo
 						mModule->mBfIRBuilder->DbgInsertDeclare(aliasValue, diVariable);
 					else
 					{
+						if (newLocalVar->mResolvedType->IsBoolean())
+						{
+							// Fix case of remote condbr referencing
+							newLocalVar->mAddr = mModule->CreateAlloca(newLocalVar->mResolvedType);
+							mModule->mBfIRBuilder->CreateStore(newLocalVar->mValue, newLocalVar->mAddr);
+						}
+
 						mModule->mBfIRBuilder->DbgInsertValueIntrinsic(aliasValue, diVariable);
-						//mModule->mBfIRBuilder->DbgInsertValueIntrinsic(newLocalVar->mValue, diVariable);
 					}
 				}
 			}