--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Wed Jun 22 11:55:45 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Wed Jun 22 12:29:57 2016 +0900
@@ -393,10 +393,9 @@
         rfb.getAcceptThread().waitForShutdown();
     }
 
-    public void proxyStart(String[] argv, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) {
+    public void proxyStart(String[] argv, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay, boolean hasViewer) {
         fbWidth = width;
         this.showTree = showTree;
-        // input into arguments Decision
         Parser parser = new Parser();
         ParametersHandler.completeParserOptions(parser);
         if (fbWidth == 0)
@@ -411,7 +410,8 @@
         if (myRfb == null) {
             myRfb = new TreeRFBProto(true, this);
         }
-
+        myRfb.setCuiVersion(!hasViewer);
+        myRfb.setHasViewer(hasViewer);
         myRfb.setShowTree(showTree);
         myRfb.setCheckDelay(checkDelay);
         myRfb.setAddSerialNum(addSerialNum);
@@ -420,8 +420,6 @@
             myRfb.fixingSizeWidth = fixingSizeWidth;
             myRfb.fixingSizeHeight = fixingSizeHeight;
         }
-        myRfb.setCuiVersion(false);
-        myRfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here?
         if (myRfb.getAcceptThread() == null) {
             myRfb.createConnectionAndStart(this);
         } else {
@@ -481,9 +479,6 @@
 
     @Override
     public ArrayList<Rectangle> getScreenRectangles() {
-        // before change the screen server, data from previous server
-        // should be stopped.
-        setCuiVersion(false);
         // New screen server has one or more screens.
         // Screens are numbered in the order from left.
         // put screens in an ArrayList.