Fix isExpired