CLC-2250 Fix expiration logic