diff --git a/configure b/configure
index 23f7ce8..9716aa4 100755
--- a/configure
+++ b/configure
@@ -31,10 +31,6 @@ if [ -x "$(command -v cmake)" ]; then
 	cd src/osqp_sources
 	mkdir -p build
 	cd build
-	CFLAGS="${CPPFLAGS} ${CFLAGS}"
-	CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}"
-	echo "CFLAGS are ${CFLAGS}"
-	echo "CXXFLAGS are ${CFLAGS}"
 	cmake -DR_HOME="${R_HOME}" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:bool=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON -DR_LANG=TRUE -DCMAKE_INSTALL_PREFIX:PATH=../../ ..
 	cmake --build . --target install
 	cd ..
diff --git a/inst/58f00bd_fixes/make_fixes.R b/inst/58f00bd_fixes/make_fixes.R
index 91d5226..42f8d15 100644
--- a/inst/58f00bd_fixes/make_fixes.R
+++ b/inst/58f00bd_fixes/make_fixes.R
@@ -66,8 +66,11 @@ replace_lines("osqp_sources/CMakeLists.txt", 2, 'cmake_minimum_required (VERSION
               comment_prefix = "#")
 
 ## Drop lines 242-255  as they are not needed
-lines <- readLines("osqp_sources/CMakeLists.txt")[-(242:255)]
-writeLines(lines, "osqp_sources/CMakeLists.txt")
+## lines <- readLines("osqp_sources/CMakeLists.txt")[-(242:255)]
+##writeLines(lines, "osqp_sources/CMakeLists.txt")
 
+## Replace findR.cmake
+replace_lines("osqp_sources/configure/cmake/FindR.cmake", 11, 'find_program(R_EXEC NAMES R R.exe PATHS ${R_HOME}/bin)',
+              comment_prefix='#')