fixed duplicated entries