Fix combo problem