fix id issue