Fix unique generators