Fix ids