Fixed #1 duplicate ID issues