diff --git a/main.go b/main.go
index 9a2b8ee..2d24a02 100644
--- a/main.go
+++ b/main.go
@@ -1360,6 +1360,9 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 		fmt.Println(singerFoldername)
 	}
 	singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
+	if dl_atmos {
+		singerFolder = filepath.Join(config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
+	}
 	var Quality string
 	if strings.Contains(config.AlbumFolderFormat, "Quality") {
 		if dl_atmos {
@@ -1679,12 +1682,12 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 				}
 				if strings.Contains(albumId, "pl.") && !config.UseSongInfoForPlaylist {
 					tags = append(tags, "disk=1/1")
-					tags = append(tags, fmt.Sprintf("track=%s", trackNum))
+					tags = append(tags, fmt.Sprintf("track=%d", trackNum))
 					tags = append(tags, fmt.Sprintf("tracknum=%d/%d", trackNum, trackTotal))
 					tags = append(tags, fmt.Sprintf("album=%s", meta.Data[0].Attributes.Name))
 				} else {
 					tags = append(tags, fmt.Sprintf("disk=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber, meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber))
-					tags = append(tags, fmt.Sprintf("track=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
+					tags = append(tags, fmt.Sprintf("track=%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
 					tags = append(tags, fmt.Sprintf("tracknum=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber, trackTotal))
 					tags = append(tags, fmt.Sprintf("album=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName))
 				}
diff --git a/main_atmos.go b/main_atmos.go
index b0a1638..fff86ed 100644
--- a/main_atmos.go
+++ b/main_atmos.go
@@ -1503,12 +1503,12 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 		}
 		if strings.Contains(albumId, "pl.") && !config.UseSongInfoForPlaylist {
 			tags = append(tags, "disk=1/1")
-			tags = append(tags, fmt.Sprintf("track=%s", trackNum))
+			tags = append(tags, fmt.Sprintf("track=%d", trackNum))
 			tags = append(tags, fmt.Sprintf("tracknum=%d/%d", trackNum, trackTotal))
 			tags = append(tags, fmt.Sprintf("album=%s", meta.Data[0].Attributes.Name))
 		} else {
 			tags = append(tags, fmt.Sprintf("disk=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber, meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber))
-			tags = append(tags, fmt.Sprintf("track=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
+			tags = append(tags, fmt.Sprintf("track=%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
 			tags = append(tags, fmt.Sprintf("tracknum=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber, trackTotal))
 			tags = append(tags, fmt.Sprintf("album=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName))
 		}