first field were not being handled correctly
because the visited map did not include the type.

R=r
OCL=31006
CL=31006