diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index 0090075..db2544e 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -1631,7 +1631,7 @@
   InitVals.reserve(NumInitElements);
   
 
-  if (T->isArrayType()) {
+  if (T->isArrayType() || T->isStructureType()) {
     for (unsigned i = 0; i < NumInitElements; ++i) {
       Expr* Init = E->getInit(i);
       NodeSet Tmp;
@@ -1659,12 +1659,6 @@
     return;
   }
 
-  if (T->isStructureType()) {
-    // FIXME: to be implemented.
-    MakeNode(Dst, E, Pred, state);
-    return;
-  }
-
   if (Loc::IsLocType(T) || T->isIntegerType()) {
     assert (E->getNumInits() == 1);
     NodeSet Tmp;