fixes in Combo