Fixed expire bug