diff --git a/scripts/setup/setup_libraries.sh b/scripts/setup/setup_libraries.sh
index 759a103e688a42d336eba01ddba13d4141acd1d2..1da0c54b030b543675e177ff8dddf4bb509c599d 100755
--- a/scripts/setup/setup_libraries.sh
+++ b/scripts/setup/setup_libraries.sh
@@ -16,7 +16,7 @@ LIBGEOTIFF_VERSION="libgeotiff-1.3.0"
 INSTANTCLIENT_VERSION="instantclient_11_2"
 METIS_VERSION="metis-5.0.2"
 BOOST_VERSION="1.53.0"
-BOOST_VERSION_UNDERSCORE=${BOOST_VERSION/./_}
+BOOST_VERSION_UNDERSCORE=${BOOST_VERSION//./_}
 
 ## Windows specific
 if [ "$OSTYPE" == 'msys' ]; then
@@ -200,7 +200,7 @@ if [ "$OSTYPE" == 'msys' ]; then
 		7za x boost_$BOOST_VERSION_UNDERSCORE.zip
 		mv boost_$BOOST_VERSION_UNDERSCORE/ boost/
 		rm boost_$BOOST_VERSION_UNDERSCORE.zip
-	elif [ -f boost/xyz ]; then
+	elif [ -d boost/stage/lib ]; then
 		BOOST_FOUND=true
 	fi