Final Fix for Windows Script