Ditched id check and everything is glorious