diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01274d002dfbb5350e992077860033db6cfa1b8d..79385e89932b5400fa09c3dc31ce7955d8dad43e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,15 +97,13 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # to find "amfe_def.h"
 ENABLE_TESTING()
 
 # -- INSTALL
-# Check if the project is the main project and the installation path is not specified
-IF(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT(CMAKE_INSTALL_PREFIX MATCHES "dartflo$"))
-    SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/dartflo" CACHE STRING "Install location" FORCE)
-ENDIF()
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+IF(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+  IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE)
     STRING(REGEX REPLACE "\\\\" "/" PY_SITE ${PY_SITE})
     SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/dartflo" CACHE STRING "Install location" FORCE)
     SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
+  ENDIF()
 ENDIF()
 IF(UNIX AND NOT APPLE)
     SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}")
diff --git a/ext/amfe b/ext/amfe
index c11ff6ee646765a19f9d43496d354e939a84b408..c617c41e748fe7436909e53ef3c5226d22ead506 160000
--- a/ext/amfe
+++ b/ext/amfe
@@ -1 +1 @@
-Subproject commit c11ff6ee646765a19f9d43496d354e939a84b408
+Subproject commit c617c41e748fe7436909e53ef3c5226d22ead506