diff --git a/Analysis/GRExprEngine.cpp b/Analysis/GRExprEngine.cpp
index e7f6f77..a011e7b 100644
--- a/Analysis/GRExprEngine.cpp
+++ b/Analysis/GRExprEngine.cpp
@@ -598,10 +598,13 @@
 void GRExprEngine::VisitCast(Expr* CastE, Expr* Ex, NodeTy* Pred, NodeSet& Dst){
   
   NodeSet S1;
-  Visit(Ex, Pred, S1);
-
   QualType T = CastE->getType();
   
+  if (T->isReferenceType())
+    VisitLVal(Ex, Pred, S1);
+  else
+    Visit(Ex, Pred, S1);
+  
   // Check for redundant casts or casting to "void"
   if (T->isVoidType() ||
       Ex->getType() == T || 
@@ -616,7 +619,9 @@
   for (NodeSet::iterator I1 = S1.begin(), E1 = S1.end(); I1 != E1; ++I1) {
     NodeTy* N = *I1;
     ValueState* St = N->getState();
-    RVal V = GetRVal(St, Ex);
+    
+    RVal V = T->isReferenceType() ? GetLVal(St, Ex) : GetRVal(St, Ex);
+    
     Nodify(Dst, CastE, N, SetRVal(St, CastE, EvalCast(V, CastE->getType())));
   }
 }
diff --git a/Analysis/GRSimpleVals.cpp b/Analysis/GRSimpleVals.cpp
index a28ff1c..fbaccba 100644
--- a/Analysis/GRSimpleVals.cpp
+++ b/Analysis/GRSimpleVals.cpp
@@ -172,7 +172,7 @@
 
 RVal GRSimpleVals::EvalCast(ValueManager& ValMgr, LVal X, QualType T) {
   
-  if (T->isPointerType())
+  if (T->isPointerType() || T->isReferenceType())
     return X;
   
   assert (T->isIntegerType());