Fix id comparison..