#135 Fix expiration status criteria