Fix Circuit Breakers