diff --git a/contracts/zero-ex/CHANGELOG.json b/contracts/zero-ex/CHANGELOG.json
index 44eae8a59a..59fa42d110 100644
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "0.8.0",
+        "changes": [
+            {
+                "note": "Trust LP boughtAmount return value",
+                "pr": 29
+            }
+        ]
+    },
     {
         "version": "0.7.0",
         "changes": [
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol
index 4dc8177406..b2e1cd8e87 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol
@@ -56,7 +56,6 @@ contract MixinZeroExBridge {
         internal
         returns (uint256 boughtAmount)
     {
-        uint256 balanceBefore = buyToken.balanceOf(address(this));
         // Trade the good old fashioned way
         sellToken.compatTransfer(
             bridgeAddress,
@@ -68,8 +67,8 @@ contract MixinZeroExBridge {
                 address(this), // recipient
                 1, // minBuyAmount
                 bridgeData
-        ) {
-            boughtAmount = buyToken.balanceOf(address(this)).safeSub(balanceBefore);
+        ) returns (uint256 _boughtAmount) {
+            boughtAmount = _boughtAmount;
             emit ERC20BridgeTransfer(
                 sellToken,
                 buyToken,
@@ -79,6 +78,7 @@ contract MixinZeroExBridge {
                 address(this)
             );
         } catch {
+            uint256 balanceBefore = buyToken.balanceOf(address(this));
             IERC20Bridge(bridgeAddress).bridgeTransferFrom(
                 address(buyToken),
                 bridgeAddress,
diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json
index c374554a7c..83522c3a9e 100644
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "5.2.0",
+        "changes": [
+            {
+                "note": "Redeploy FQT with CORRECT deployer",
+                "pr": 29
+            }
+        ]
+    },
     {
         "version": "5.1.0",
         "changes": [
diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json
index a8add3b7c9..1110ba617e 100644
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -36,7 +36,7 @@
             "wethTransformer": "0x68c0bb685099dc7cb5c5ce2b26185945b357383e",
             "payTakerTransformer": "0x49b9df2c58491764cf40cb052dd4243df63622c7",
             "affiliateFeeTransformer": "0x4581b59a05ba373b9f67676f66bdb5fcd67e7567",
-            "fillQuoteTransformer": "0x10c394406d2b15fb8e67b9a7a0dd03fa4d3e8099"
+            "fillQuoteTransformer": "0xfbfb26935f15db6a319a43db5085245a6df1e408"
         }
     },
     "3": {
@@ -76,7 +76,7 @@
             "wethTransformer": "0x8d822fe2b42f60531203e288f5f357fa79474437",
             "payTakerTransformer": "0x150652244723102faeaefa4c79597d097ffa26c6",
             "affiliateFeeTransformer": "0xa39b40642e8e00435857a0fe7d0655e08cc2217e",
-            "fillQuoteTransformer": "0x83e5e80b685a7bc0cf7364fc0f9f95a14b3051ac"
+            "fillQuoteTransformer": "0x3fb85e0c1e9e0ba4ba9a4072442a2540c0473db1"
         }
     },
     "4": {
@@ -116,7 +116,7 @@
             "wethTransformer": "0x8d822fe2b42f60531203e288f5f357fa79474437",
             "payTakerTransformer": "0x150652244723102faeaefa4c79597d097ffa26c6",
             "affiliateFeeTransformer": "0xa39b40642e8e00435857a0fe7d0655e08cc2217e",
-            "fillQuoteTransformer": "0xb69af86b536e4869947b53b0b969750ee5fb1257"
+            "fillQuoteTransformer": "0x3fb85e0c1e9e0ba4ba9a4072442a2540c0473db1"
         }
     },
     "42": {
@@ -156,7 +156,7 @@
             "wethTransformer": "0x9ce35b5ee9e710535e3988e3f8731d9ca9dba17d",
             "payTakerTransformer": "0x5a53e7b02a83aa9f60ccf4e424f0442c255bc977",
             "affiliateFeeTransformer": "0x870893920a96a28d4b63c0a7d06a521e3bd074b3",
-            "fillQuoteTransformer": "0x2013735f6df965494a0fbc292f84dd44debaba3e"
+            "fillQuoteTransformer": "0x8d2d732e5fe6d4d6d5e715200b84dfa69fb05478"
         }
     },
     "1337": {