Fixing block id conflicts.