Swing continuity fix