diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdeff05..376f6af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,6 @@ endif()
 set(CMAKE_CXX_STANDARD 11)
 
 set(PIP_LIBRARY pip)
-set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt" "introspection" "concurrent" "cloud")
 set(PIP_INCLUDES)
 
 if(LIB)
@@ -101,9 +100,6 @@ else()
 	message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 endif()
 
-foreach(F ${PIP_FOLDERS})
-	list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/lib/main/${F}")
-endforeach(F)
 #message(${PIP_INCLUDES})
 if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM))
 	set(PIP_CMG "pip_cmg")
@@ -150,6 +146,9 @@ else()
 	endif()
 
 	add_subdirectory(pip)
+	foreach(F ${PIP_MAIN_FOLDERS})
+		list(APPEND PIP_INCLUDES "${F}")
+	endforeach(F)
 	set(_DIRS)
 	if (SomeQtFound)
 		message(STATUS "Building Qt-derived targets for ${QtVersions}")
diff --git a/pip b/pip
index 48692a4..c7ac4fa 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit 48692a47246e96f39f6475f47438cfa56e84f368
+Subproject commit c7ac4fa55176859fc518e01d7a7ced887aac2df9
diff --git a/piqt_utils/piqt_connection_view.cpp b/piqt_utils/piqt_connection_view.cpp
index 3f5437c..6d968f6 100644
--- a/piqt_utils/piqt_connection_view.cpp
+++ b/piqt_utils/piqt_connection_view.cpp
@@ -74,7 +74,7 @@ void FilterItem::rename() {
 		piForeachC (PICodeInfo::EnumeratorInfo & i, ei->members)
 			if (i.value == mode()) {
 				ms = PI2QString(i.name);
-				piBreak;
+				break;
 			}
 	}
 	text_mode->setText(ms);