diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3173ba3..c09bc2b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,19 @@ Changelog
 
 This project adheres to `Semantic Versioning <https://semver.org/>`_.
 
+1.6.1 (2021-07-19)
+------------------
+
+**Added**
+
+**Fixed**
+
+* Syntax error leading to error when handling files/folders without barcode
+
+**Dependencies**
+
+**Deprecated**
+
 1.6.0 (2021-07-16)
 ------------------
 
diff --git a/dropboxhandler/dropboxhandler.py b/dropboxhandler/dropboxhandler.py
index 98e26c5..67d290e 100644
--- a/dropboxhandler/dropboxhandler.py
+++ b/dropboxhandler/dropboxhandler.py
@@ -80,7 +80,7 @@ def generate_openbis_name(path):
         barcode = extract_barcode(cleaned_name)
     except ValueError:
         logger.warn("No or more than one barcode in file: %s. Trying to find respective rule.", path)
-        return name
+        return cleaned_name
     name = cleaned_name.replace(barcode, "")
     if name.startswith('_'):
         name = name[1:]
diff --git a/setup.py b/setup.py
index 8d4453a..596f8a5 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='dropboxhandler',
-    version='1.6.0',
+    version='1.6.1',
     author='Adrian Seyboldt',
     author_email='adrian.seyboldt@web.de',
     url="https://github.com/qbicsoftware/dropboxhandler",