Fix ID verification