diff --git a/claim/claim.go b/claim/claim.go
index 2e2bfc0..35ce88d 100644
--- a/claim/claim.go
+++ b/claim/claim.go
@@ -41,7 +41,7 @@ func (c *Claim) setValue(val []byte) *Claim     { c.Value = val; return c }
 func (c *Claim) String() string                 { return claimToString(c) }
 
 func (c *Claim) expireAt() Height {
-	if c.Accepted >= paramExtendedClaimExpirationForkHeight {
+	if c.Accepted+paramOriginalClaimExpirationTime > paramExtendedClaimExpirationForkHeight {
 		return c.Accepted + paramExtendedClaimExpirationTime
 	}
 	return c.Accepted + paramOriginalClaimExpirationTime
diff --git a/claim/param.go b/claim/param.go
index e779661..f86205a 100644
--- a/claim/param.go
+++ b/claim/param.go
@@ -20,7 +20,7 @@ const (
 const (
 	DefaultOriginalClaimExpirationTime       Height = 262974
 	DefaultExtendedClaimExpirationTime       Height = 2102400
-	DefaultExtendedClaimExpirationForkHeight Height = 278160
+	DefaultExtendedClaimExpirationForkHeight Height = 400155
 )
 
 var (