duplicated entries bug fixed