diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc
index 2a468f7..0fd0f89 100644
--- a/compiler/cpp/src/generate/t_php_generator.cc
+++ b/compiler/cpp/src/generate/t_php_generator.cc
@@ -1834,34 +1834,34 @@
     }
   }
 
+  scope_up(out);
+
+  if (ttype->is_map()) {
+    string kiter = tmp("kiter");
+    string viter = tmp("viter");
+    indent(out) <<
+      "foreach ($" << prefix << " as " <<
+      "$" << kiter << " => $" << viter << ")" << endl;
     scope_up(out);
-
-    if (ttype->is_map()) {
-      string kiter = tmp("kiter");
-      string viter = tmp("viter");
-      indent(out) <<
-        "foreach ($" << prefix << " as " <<
-        "$" << kiter << " => $" << viter << ")" << endl;
-      scope_up(out);
-      generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-      scope_down(out);
-    } else if (ttype->is_set()) {
-      string iter = tmp("iter");
-      indent(out) <<
-        "foreach ($" << prefix << " as $" << iter << " => $true)" << endl;
-      scope_up(out);
-      generate_serialize_set_element(out, (t_set*)ttype, iter);
-      scope_down(out);
-    } else if (ttype->is_list()) {
-      string iter = tmp("iter");
-      indent(out) <<
-        "foreach ($" << prefix << " as $" << iter << ")" << endl;
-      scope_up(out);
-      generate_serialize_list_element(out, (t_list*)ttype, iter);
-      scope_down(out);
-    }
-
+    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
     scope_down(out);
+  } else if (ttype->is_set()) {
+    string iter = tmp("iter");
+    indent(out) <<
+      "foreach ($" << prefix << " as $" << iter << " => $true)" << endl;
+    scope_up(out);
+    generate_serialize_set_element(out, (t_set*)ttype, iter);
+    scope_down(out);
+  } else if (ttype->is_list()) {
+    string iter = tmp("iter");
+    indent(out) <<
+      "foreach ($" << prefix << " as $" << iter << ")" << endl;
+    scope_up(out);
+    generate_serialize_list_element(out, (t_list*)ttype, iter);
+    scope_down(out);
+  }
+
+  scope_down(out);
 
   if (!binary_inline_) {
     if (ttype->is_map()) {