diff --git a/plugin/NerdPack.plg b/plugin/NerdPack.plg
index 17d1a4ce..68482498 100755
--- a/plugin/NerdPack.plg
+++ b/plugin/NerdPack.plg
@@ -213,7 +213,7 @@ The 'install' script.
 <INLINE>
 #Verify Unraid Version
 source /etc/unraid-version
-VER=${version:0:3}
+VER=$(expr "$version" : "\([0-9]*\.[0-9]*\)")
 if [[ $VER == 6.0 ]]; then
   echo "Unraid version 6.1 or higher is required"
   exit 1
@@ -302,4 +302,4 @@ echo ""
 </INLINE>
 </FILE>
 
-</PLUGIN>
\ No newline at end of file
+</PLUGIN>
diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php
index ebed12c5..b99cf525 100644
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php
@@ -1,6 +1,6 @@
 <?php
 $plg_path = '/boot/config/plugins/NerdPack/'; // plugin path
-$os_version = substr(parse_ini_file('/etc/unraid-version')['version'],0,3);
+$os_version = strtok(parse_ini_file('/etc/unraid-version')['version'], '.') . '.' . strtok('.');
 $pkg_path = $plg_path."packages/$os_version/"; // package path
 if (!is_dir($pkg_path))
     mkdir($pkg_path);