Use default combination type also where it was missing