Fix id field