diff --git a/Gateway/Transaction/Base/ResourceGateway/AbstractAddressDataProvider.php b/Gateway/Transaction/Base/ResourceGateway/AbstractAddressDataProvider.php
index 757238f2..991c55fa 100644
--- a/Gateway/Transaction/Base/ResourceGateway/AbstractAddressDataProvider.php
+++ b/Gateway/Transaction/Base/ResourceGateway/AbstractAddressDataProvider.php
@@ -39,10 +39,10 @@ public function getCustomerAddressNumber($shipping)
     public function getCustomerAddressComplement($shipping)
     {
         if ($shipping) {
-            return !$this->getShippingAddressAttribute($this->getConfig()->getCustomerAddressDistrict()) ? '' : $this->getShippingAddressAttribute($this->getConfig()->getCustomerAddressComplement());
+            return !$this->getShippingAddressAttribute($this->getConfig()->getCustomerAddressComplement()) ? 'street_4' : $this->getConfig()->getCustomerAddressComplement();
         }
         
-        return !$this->getBillingAddressAttribute($this->getConfig()->getCustomerAddressDistrict()) ? '' : $this->getShippingAddressAttribute($this->getConfig()->getCustomerAddressComplement());
+        return !$this->getBillingAddressAttribute($this->getConfig()->getCustomerAddressComplement()) ? 'street_4' : $this->getConfig()->getCustomerAddressComplement();
     }
 
     /**
diff --git a/etc/di.xml b/etc/di.xml
index a1d67a3c..5342bfe4 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -308,7 +308,7 @@
     <virtualType name="PagarmeBilletAuthorizeCommand" type="Pagarme\Pagarme\Gateway\Transaction\Base\Command\AuthorizeCommand">
         <arguments>
             <argument name="requestBuilder" xsi:type="object">Pagarme\Pagarme\Gateway\Transaction\Billet\ResourceGateway\Create\RequestBuilder</argument>
-            <argument name="responseHandler" xsi:type="object">PagarmebilletCommandResponseHandlerPool</argument>
+            <argument name="responseHandler" xsi:type="object">PagarmeBilletCommandResponseHandlerPool</argument>
             <argument name="validator" xsi:type="object">Pagarme\Pagarme\Gateway\Transaction\Billet\ResourceGateway\Create\Response\Validator</argument>
         </arguments>
     </virtualType>