FIX:(#654) Folder names garbled in Windows due to trailing space