Fix
GenerateNextIdWithDifferentPrefix
Revert "Fix"

This reverts commit 857a9eac4050f5b7b5e4079cba4961e1ab800c0c.