Address type checking problem pointed out by the joint build