diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a051300..b0b8e7540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.6
+*Sept 15th, 2018*
+
+BUG FIXES
+
+- [core] Critical fix
+
 ## 0.3.5
 *Sept 13th, 2018*
 
diff --git a/core/state/state_candidate.go b/core/state/state_candidate.go
index 9d3aa16d0..8403df6b1 100644
--- a/core/state/state_candidate.go
+++ b/core/state/state_candidate.go
@@ -83,6 +83,10 @@ func (s *Stake) CalcBipValue(context *StateDB) *big.Int {
 		return big.NewInt(0).Set(s.Value)
 	}
 
+	if s.Value.Cmp(types.Big0) == 0 {
+		return big.NewInt(0)
+	}
+
 	if _, has := context.stakeCache[s.Coin]; !has {
 		totalStaked := big.NewInt(0)
 		candidates := context.getStateCandidates()
diff --git a/version/version.go b/version/version.go
index 3237d14d7..37ce6daba 100755
--- a/version/version.go
+++ b/version/version.go
@@ -4,12 +4,12 @@ package version
 const (
 	Maj = "0"
 	Min = "3"
-	Fix = "5"
+	Fix = "6"
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.3.5"
+	Version = "0.3.6"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string