Bug ~ Unique Id being duplicated