diff --git a/server.js b/server.js
index 4de47b9..b784c8e 100644
--- a/server.js
+++ b/server.js
@@ -53,7 +53,7 @@ function sendListOfUploadedFiles(res){
 
 
 function sendUploadedFile(url, res){
-  let file = path.join(__dirname, url);
+  let file = path.join(__dirname, decodeURIComponent(url));
   fs.readFile(file, (err, content) => {
     if(err){
       res.writeHead(404, {'Content-Type': 'text'});
@@ -71,7 +71,7 @@ function sendUploadedFile(url, res){
 function saveUploadedFile(req, res){
   console.log('saving uploaded file');
   let fileName = path.basename(req.url);
-  let file = path.join(__dirname, 'download', fileName)
+  let file = path.join(__dirname, 'download', decodeURIComponent(fileName))
   req.pipe(fs.createWriteStream(file));
   req.on('end', () => {
     res.writeHead(200, {'Content-Type': 'text'});
@@ -84,4 +84,4 @@ function sendInvalidRequest(res){
   res.writeHead(400, {'Content-Type': 'application/json'});
   res.write('Invalid Request');
   res.end(); 
-}
\ No newline at end of file
+}