fix id mapping