Fix expire_behavior issue