diff --git a/src/Mod/Image/Gui/GLImageBox.cpp b/src/Mod/Image/Gui/GLImageBox.cpp
index e9c3b5ebc1..916bc52fa2 100644
--- a/src/Mod/Image/Gui/GLImageBox.cpp
+++ b/src/Mod/Image/Gui/GLImageBox.cpp
@@ -246,8 +246,10 @@ void GLImageBox::getDisplayedImageAreaSize(int &dx, int &dy)
             dx = 0;
             dy = 0;
         }
-        dx = ibrx - itlx + 1;
-        dy = ibry - itly + 1;
+        else {
+            dx = ibrx - itlx + 1;
+            dy = ibry - itly + 1;
+        }
     }
 }
 
diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp
index 188af7b16e..04fdaa7e28 100644
--- a/src/Mod/Import/App/AppImportPy.cpp
+++ b/src/Mod/Import/App/AppImportPy.cpp
@@ -316,9 +316,10 @@ private:
                 if(keepPlacement!=Py_None)
                     ocaf.setKeepPlacement(PyObject_IsTrue(keepPlacement));
                 ocaf.exportObjects(objs);
-            }else{
-                bool keepExplicitPlacement = objs.size() > 1;
-                keepExplicitPlacement = Standard_True;
+            }
+            else {
+                //bool keepExplicitPlacement = objs.size() > 1;
+                bool keepExplicitPlacement = Standard_True;
                 ExportOCAF ocaf(hDoc, keepExplicitPlacement);
                 // That stuff is exporting a list of selected objects into FreeCAD Tree
                 std::vector <TDF_Label> hierarchical_label;
diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp
index 875f27514a..07217541a4 100644
--- a/src/Mod/Import/Gui/AppImportGuiPy.cpp
+++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp
@@ -597,9 +597,10 @@ private:
                 if(keepPlacement!=Py_None)
                     ocaf.setKeepPlacement(PyObject_IsTrue(keepPlacement));
                 ocaf.exportObjects(objs);
-            } else {
-                bool keepExplicitPlacement = objs.size() > 1;
-                keepExplicitPlacement = Standard_True;
+            }
+            else {
+                //bool keepExplicitPlacement = objs.size() > 1;
+                bool keepExplicitPlacement = Standard_True;
                 ExportOCAFGui ocaf(hDoc, keepExplicitPlacement);
                 // That stuff is exporting a list of selected objects into FreeCAD Tree
                 std::vector <TDF_Label> hierarchical_label;