diff --git a/src/Common/CSE/Get-GPOCSE.ps1 b/src/Common/CSE/Get-GPOCSE.ps1
index 328a31c..5053904 100644
--- a/src/Common/CSE/Get-GPOCSE.ps1
+++ b/src/Common/CSE/Get-GPOCSE.ps1
@@ -7,7 +7,7 @@ function Get-GPOCSE {
     $GPO = Get-GPOObject -Id $Id
     $AttributeString = $GPO.gPCMachineExtensionNames[0]
 
-    $ListsRegExFilter = '\[\{00000000-0000-0000-0000-000000000000\}(?<Tools>(?:\{[0-9A-f]{8}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{12}\})*)\](?<CseSets>(?:\[(?:\{[0-9A-f]{8}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{12}\})(?:\{[0-9A-f]{8}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{12}\})*\])*)'
+    $ListsRegExFilter = '(\[\{00000000-0000-0000-0000-000000000000\}(?<Tools>(?:\{[0-9A-f]{8}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{12}\})*)\])*(?<CseSets>(?:\[(?:\{[0-9A-f]{8}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{12}\})(?:\{[0-9A-f]{8}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{4}-[0-9A-f]{12}\})*\])*)'
     $ListsRegEx = [regex]::new($ListsRegExFilter)
     $ListMatches = $ListsRegEx.Matches($AttributeString)
 
diff --git a/src/Definitions/CSEClasses.ps1 b/src/Definitions/CSEClasses.ps1
index 0ec258f..404fc99 100644
--- a/src/Definitions/CSEClasses.ps1
+++ b/src/Definitions/CSEClasses.ps1
@@ -38,7 +38,7 @@ class GPOExtensionNamesAttribute {
 
         $sb = [System.Text.StringBuilder]::new()
         foreach ($Tool in $SortedTools) {
-            [void]$sb.Append($Tool.ToString('B'))
+            [void]$sb.Append($Tool.ToString('B').ToUpper())
         }
         $SortedToolsString = $sb.ToString()
 
@@ -47,11 +47,11 @@ class GPOExtensionNamesAttribute {
         $sb = [System.Text.StringBuilder]::new()
         foreach ($CSE in $SortedCSE) {
             $CurrentCSESet = $this.Members | Where-Object -FilterScript { $_.CSE -eq $CSE }
-            $CurrentCSEString = $CSE.ToString('B')
+            $CurrentCSEString = $CSE.ToString('B').ToUpper()
             $SortedCSETools = $CurrentCSESet.Tool | Sort-Object
             $sb2 = [System.Text.StringBuilder]::new()
             foreach ($Tool in $SortedCSETools) {
-                [void]$sb2.Append($Tool.ToString('B'))
+                [void]$sb2.Append($Tool.ToString('B').ToUpper())
             }
             $SortedCSEToolsString = $sb2.ToString()
             [void]$sb.Append(('[{0}{1}]' -f $CurrentCSEString, $SortedCSEToolsString))
diff --git a/src/PSGPPreferences.psd1 b/src/PSGPPreferences.psd1
index 6b907c9..4fd9ecf 100644
--- a/src/PSGPPreferences.psd1
+++ b/src/PSGPPreferences.psd1
@@ -1,6 +1,6 @@
 @{
     RootModule        = 'PSGPPreferences.psm1'
-    ModuleVersion     = '0.3.2'
+    ModuleVersion     = '0.3.3'
     GUID              = '840171e9-2b12-448d-9fe3-9365af87081e'
     Author            = 'Kirill Nikolaev'
     PowerShellVersion = '5.1'