improve combo breaker logic