Randomize id fix