Bug fix on AC lifetime