AIA-40 fix for comment duplication.