Fix for early breaking