combi bug fix