Combination code fix