Fixed filename with spaces problem