Fix unique ID generator;