fix combo bugs