diff --git a/app/views/shop/checkout/_form.html.haml b/app/views/shop/checkout/_form.html.haml
index 192ab67aba..5ae7631b7b 100644
--- a/app/views/shop/checkout/_form.html.haml
+++ b/app/views/shop/checkout/_form.html.haml
@@ -19,7 +19,7 @@
 
         %fieldset
           %legend Billing Address
-          = f.fields_for current_order.bill_address do |ba|
+          = f.fields_for :bill_address do |ba|
             .row
               .large-12.columns
                 = ba.text_field :address1