Fix generate ID
Fix generate ID