fix identifier generator