Duplication fix implemented.