fix id issues