diff --git a/make_win_usb b/make_win_usb
index 447b45e..aa15ad8 100755
--- a/make_win_usb
+++ b/make_win_usb
@@ -24,9 +24,10 @@ sudo parted ${WIN_USB} mklabel msdos
 
 # Create one big partition with "boot" flag then format in NFTS
 sudo parted ${WIN_USB} mkpart primary 0% 100%
-sleep 10
 sudo parted ${WIN_USB} set 1 boot on
-sudo mkfs.ntfs ${WIN_USB}1 --fast --no-indexing
+#sudo mkfs.ntfs ${WIN_USB}1 --fast --no-indexing
+# Need a FAT32 partition to be able to install Windaube on UEFI system!
+sudo mkfs.vfat ${WIN_USB}1
 
 # Mount first partition of the USB key
 sudo mkdir -p -- "${WIN_USB_MNT_PATH}"