diff --git a/token-erc-20/chaincode-go/chaincode/token_contract.go b/token-erc-20/chaincode-go/chaincode/token_contract.go
index 836eeeb7..b6b7bad6 100644
--- a/token-erc-20/chaincode-go/chaincode/token_contract.go
+++ b/token-erc-20/chaincode-go/chaincode/token_contract.go
@@ -695,7 +695,7 @@ func add(b int, q int) (int, error) {
 	var sum int
 	sum = q + b
 
-	if (sum < q) == (b >= 0 && q >= 0) {
+	if (sum < q || sum < b) == (b >= 0 && q >= 0) {
 		return 0, fmt.Errorf("Math: addition overflow occurred %d + %d", b, q)
 	}