fixed Duplicate Id issue