NiFi Toolkit .bat breaks with paths containing spaces

I'm using PowerShell on Windows Server 2019 with Java 1.8, and the following command run from the "nifi-toolkit-1.13.2" directory:

cd 'C:\Program Files\Apache\NiFi Toolkit\nifi-toolkit-1.13.2\'

.\bin\tls-toolkit.bat standalone -h

returns: 

Error: Could not find or load main class Files\Apache\NiFi

I believe the issue lies with spaces in the path where toolkit is located and if I alter this line in the tls-toolkit.bat:

SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_OPTS% org.apache.nifi.toolkit.tls.TlsToolkitMain

to include double quotes around the %LIB_DIR% variable:

SET JAVA_PARAMS=-cp "%LIB_DIR%\*" %JAVA_OPTS% org.apache.nifi.toolkit.tls.TlsToolkitMain

 It works as expected.