diff --git a/claimtrie/node/manager.go b/claimtrie/node/manager.go
index d098005c..5b200c31 100644
--- a/claimtrie/node/manager.go
+++ b/claimtrie/node/manager.go
@@ -269,6 +269,10 @@ func hasZeroActiveClaims(n *Node) bool {
 // aWorkaroundIsNeeded handles bugs that existed in previous versions
 func (nm *BaseManager) aWorkaroundIsNeeded(n *Node, chg change.Change) bool {
 
+	if chg.Height >= param.ActiveParams.GrandForkHeight {
+		return false
+	}
+
 	if chg.Type == change.SpendClaim || chg.Type == change.SpendSupport {
 		return false
 	}