Post-breakout fix