fix id's