Fix id problem (Probably)