Block expiry fix