Fix for CB double firing