diff --git a/contracts/upgradeable_contracts/ERC677Bridge.sol b/contracts/upgradeable_contracts/ERC677Bridge.sol
index 47478b778..2a89821f0 100644
--- a/contracts/upgradeable_contracts/ERC677Bridge.sol
+++ b/contracts/upgradeable_contracts/ERC677Bridge.sol
@@ -2,8 +2,9 @@ pragma solidity 0.4.24;
 
 import "./BasicBridge.sol";
 import "../interfaces/ERC677.sol";
+import "../interfaces/ERC677Receiver.sol";
 
-contract ERC677Bridge is BasicBridge {
+contract ERC677Bridge is BasicBridge, ERC677Receiver {
     function erc677token() public view returns (ERC677) {
         return ERC677(addressStorage[keccak256(abi.encodePacked("erc677token"))]);
     }
diff --git a/contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol b/contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
index 0b2dc8c36..3f66df91e 100644
--- a/contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
+++ b/contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
@@ -3,14 +3,12 @@ pragma solidity 0.4.24;
 import "../../libraries/Message.sol";
 import "../../upgradeability/EternalStorage.sol";
 import "../../interfaces/IBurnableMintableERC677Token.sol";
-import "../../interfaces/ERC677Receiver.sol";
 import "../BasicHomeBridge.sol";
 import "../OverdrawManagement.sol";
 import "./RewardableHomeBridgeErcToErc.sol";
 import "../ERC677BridgeForBurnableMintableToken.sol";
 
 contract HomeBridgeErcToErc is
-    ERC677Receiver,
     EternalStorage,
     BasicHomeBridge,
     ERC677BridgeForBurnableMintableToken,
diff --git a/contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol b/contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
index 210ce8e04..420f2be5f 100644
--- a/contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
+++ b/contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
@@ -1,14 +1,12 @@
 pragma solidity 0.4.24;
 
 import "../../interfaces/IBurnableMintableERC677Token.sol";
-import "../../interfaces/ERC677Receiver.sol";
 import "../BasicForeignBridge.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol";
 import "../ERC677BridgeForBurnableMintableToken.sol";
 import "./RewardableForeignBridgeNativeToErc.sol";
 
 contract ForeignBridgeNativeToErc is
-    ERC677Receiver,
     BasicForeignBridge,
     ERC677BridgeForBurnableMintableToken,
     RewardableForeignBridgeNativeToErc