Another type_traits fix