diff --git a/deemix/__init__.py b/deemix/__init__.py
index 4cff6b3..01cf9ed 100644
--- a/deemix/__init__.py
+++ b/deemix/__init__.py
@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "1.5.0"
+__version__ = "1.5.1"
diff --git a/deemix/utils/pathtemplates.py b/deemix/utils/pathtemplates.py
index 97bb58e..ed40483 100644
--- a/deemix/utils/pathtemplates.py
+++ b/deemix/utils/pathtemplates.py
@@ -94,7 +94,7 @@ def generateFilepath(track, settings):
                 (track.playlist and settings['createStructurePlaylist'])
             )
     ):
-        filepath = filepath / settingsRegexAlbum(settings['albumNameTemplate'], track.album, settings, track.playlist if track.playlist else None)
+        filepath = filepath / settingsRegexAlbum(settings['albumNameTemplate'], track.album, settings, track.playlist)
         coverPath = filepath
 
     if not (track.playlist and not settings['tags']['savePlaylistAsCompilation']):
@@ -109,7 +109,7 @@ def generateFilepath(track, settings):
                 (track.playlist and settings['createStructurePlaylist'])
             )
     )):
-        filepath = filepath / 'CD' + str(track.discNumber)
+        filepath = filepath / f'CD{str(track.discNumber)}'
 
     return (filepath, artistPath, coverPath, extrasPath)
 
diff --git a/setup.py b/setup.py
index e93c013..9e7ee27 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="deemix",
-    version="1.5.0",
+    version="1.5.1",
     description="A barebone deezer downloader library",
     long_description=README,
     long_description_content_type="text/markdown",