Follow up

Deal with the situation there might be duplicated element