#38 fix Swing deadlock