Minor fix to type handling
Merge branch '2.4'