Fixed Combo-related issue