diff --git a/AUTHORS.md b/AUTHORS.md
index 26198382..07f0fc9a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -51,6 +51,7 @@ date of first contribution):
   * [Mark Walker](https://github.com/markwal)
   * [Lucas Clemente](https://github.com/lucas-clemente)
   * [Andrew Erickson](https://github.com/aerickson)
+  * [Nicanor Romero Venier](https://github.com/nicanor-romero)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and
diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py
index d350916d..61614ae6 100644
--- a/src/octoprint/server/util/tornado.py
+++ b/src/octoprint/server/util/tornado.py
@@ -245,7 +245,7 @@ class UploadStorageFallbackHandler(tornado.web.RequestHandler):
 			self._on_part_header(self._buffer[delimiter_len+2:end_of_header])
 			self._buffer = self._buffer[end_of_header + 4:]
 
-		if delimiter_loc != -1 and self._buffer[delimiter_len:delimiter_len+2] == "--":
+		if delimiter_loc != -1 and self._buffer.strip() == delimiter + "--":
 			# we saw the last boundary and are at the end of our request
 			if self._current_part:
 				self._on_part_finish(self._current_part)