Fixed duplicated entries