bugfix dublicate id