fixed duplicate id error