Final list fix? :O