Potential for for issue #7152

Not too familiar with the fileserver code but "it works for me".