Fix id reference