Fixed bug reported by Peio where question marks appeared in filenames