Fix the bug of mismatched data types in the diff

Fix the bug of mismatched data types in the diff #3112