Fix id problem