Fix id removal