diff --git a/Makefile b/Makefile
index 3a370cb..2cf4d7e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ ifeq ($(OS), Windows_NT)
 	options = -pthread -lopengl32 -lgdi32 -lwinmm -mwindows
 
 	# Set Windows commands
-	THEN = &&
+	THEN = &
 	cleanCommand = del ${CURDIR}\build\*.exe
 else
 	# Check for MacOS/Linux
@@ -58,9 +58,9 @@ include: submodules
 # Copy commands for Windows
 ifeq ($(platform), Windows)
 	-mkdir $(mkdirOptions) .\include
-	robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h || if errorlevel gtr 7 exit errorlevel
-	robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h || if errorlevel gtr 7 exit errorlevel
-	robocopy "vendor\raylib-cpp\include" "include" *.hpp || if errorlevel gtr 7 exit errorlevel
+	robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit errorlevel
+	robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit errorlevel
+	robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit errorlevel
 # Copy commands for UNIX/Linux
 else
 	mkdir $(mkdirOptions) include
@@ -74,7 +74,7 @@ lib: submodules
 	cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP
 ifeq ($(platform), Windows)
 	-mkdir $(mkdirOptions) lib\$(platform)
-	robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a || if errorlevel gtr 7 exit /b errorlevel
+	robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit /b errorlevel
 else
 	mkdir $(mkdirOptions) lib/$(platform)
 	cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a