Fix issue #657, fix sending FNAME with spaces