Fix for file and directory names containing #