diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp b/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
index 8e0b42692..74ced794b 100644
--- a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
+++ b/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
@@ -2797,7 +2797,7 @@ template<class CheckSupportedFun, class EmitLdAddrFun>
 void HhbcTranslator::emitBind(const StringData* name,
                               CheckSupportedFun checkSupported,
                               EmitLdAddrFun emitLdAddr) {
-  if (!(this->*checkSupported)(name, topC(0)->type(), 1)) return;
+  if (!(this->*checkSupported)(name, topV(0)->type(), 1)) return;
   SSATmp* src = popV();
   emitBindMem((this->*emitLdAddr)(name), src);
 }
diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.h b/hphp/runtime/vm/translator/hopt/hhbctranslator.h
index 88f0b591a..7c4478ef7 100644
--- a/hphp/runtime/vm/translator/hopt/hhbctranslator.h
+++ b/hphp/runtime/vm/translator/hopt/hhbctranslator.h
@@ -657,6 +657,7 @@ private:
   SSATmp* popA() { return pop(Type::Cls);       }
   SSATmp* popF() { return pop(Type::Gen);       }
   SSATmp* topC(uint32_t i = 0) { return top(Type::Cell, i); }
+  SSATmp* topV(uint32_t i = 0) { return top(Type::BoxedCell, i); }
   std::vector<SSATmp*> peekSpillValues() const;
   SSATmp* emitSpillStack(Trace* t, SSATmp* sp,
                          const std::vector<SSATmp*>& spillVals);
diff --git a/hphp/test/quick/BindS_twice.php b/hphp/test/quick/BindS_twice.php
new file mode 100644
index 000000000..275d89310
--- /dev/null
+++ b/hphp/test/quick/BindS_twice.php
@@ -0,0 +1,19 @@
+<?php
+
+class C {
+  public static $blar;
+  public static $blor;
+
+  public static function buh(&$thinger = null) {
+    self::$blar = &$thinger;
+    self::$blor = &self::$blar;
+  }
+}
+
+function main() {
+  C::buh();
+  var_dump(C::$blar);
+  var_dump(C::$blor);
+}
+
+main();
diff --git a/hphp/test/quick/BindS_twice.php.expect b/hphp/test/quick/BindS_twice.php.expect
new file mode 100644
index 000000000..e2a4ea7d2
--- /dev/null
+++ b/hphp/test/quick/BindS_twice.php.expect
@@ -0,0 +1,2 @@
+NULL
+NULL
diff --git a/hphp/test/quick/bindg_weird.hhas b/hphp/test/quick/bindg_weird.hhas
new file mode 100644
index 000000000..e24119800
--- /dev/null
+++ b/hphp/test/quick/bindg_weird.hhas
@@ -0,0 +1,33 @@
+.main {
+  FPushFuncD 0 "main"
+  FCall 0
+  PopR
+  Int 1
+  RetC
+}
+
+.function tracelet_breaker() {
+  Int 1
+  RetC
+}
+
+.function main() {
+  String "global_var"
+
+  Null
+  Box
+
+  String "tracelet_breaker"
+  FPushFunc 0
+  FCall 0
+  UnboxR
+  SetL $foo
+  PopC
+
+  BindG
+  PopV
+
+  Int 1
+  RetC
+}
+
diff --git a/hphp/test/quick/bindg_weird.hhas.expect b/hphp/test/quick/bindg_weird.hhas.expect
new file mode 100644
index 000000000..e69de29bb