Fix id passing