Fixed Combo/Edit bug