Ok, time to try to fix that Swing layer...