Fixes invokeAndWait issue on EDT; references #24