diff --git a/contracts/token/TokenVesting.sol b/contracts/token/TokenVesting.sol
index a4ca4b088..da6d4a53f 100644
--- a/contracts/token/TokenVesting.sol
+++ b/contracts/token/TokenVesting.sol
@@ -106,10 +106,10 @@ contract TokenVesting is Ownable {
 
     if (now < cliff) {
       return 0;
-    } else if (now >= start + duration || revoked[token]) {
+    } else if (now >= start.add(duration) || revoked[token]) {
       return totalBalance;
     } else {
-      return totalBalance.mul(now - start).div(duration);
+      return totalBalance.mul(now.sub(start)).div(duration);
     }
   }
 }