I suspect this should be `+ i.type;`, but if so it needs to be put in both places.