diff --git a/CHANGES.txt b/CHANGES.txt
index 11560e8..88e1814 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,7 @@
-v3.6.120
+v3.6.121
 - Added --reboot option to reboot the NAS after a DSM update where the build number has changed.
   - Only needed if NVMe volume or PCIe card need a 2nd reboot after DSM update.
   - Note: This version of the script needs to run once to create the file that tracks the DSM build number.
-- Bug fix for drive models with multiple consecutive spaces in model name. Issue #559
 
 v3.6.119
 - Bug fix for "cat: /sys/block//sys/block/sata1/device/vendor: No such file or directory" errors. Issue #554
diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index fed0553..2bad69d 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -29,7 +29,7 @@
 # /var/packages/StorageManager/target/ui/storage_panel.js
 
 
-scriptver="v3.6.120"
+scriptver="v3.6.121"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 scriptname=syno_hdd_db
@@ -1026,7 +1026,7 @@ getdriveinfo(){
 
         # Get drive model
         hdmodel=$(cat "$1/device/model")
-        hdmodel=$(echo "$hdmodel" | sed 's/^[[:space:]]//;s/[[:space:]]$//')  # trim leading and trailing white space
+        hdmodel=$(printf "%s" "$hdmodel" | xargs)  # trim leading and trailing white space
 
         # Fix dodgy model numbers
         fixdrivemodel "$hdmodel"