diff --git a/lib/external/pattern_language b/lib/external/pattern_language
index 56c1951f3..837344b00 160000
--- a/lib/external/pattern_language
+++ b/lib/external/pattern_language
@@ -1 +1 @@
-Subproject commit 56c1951f3ad94579591171157a5780f7775e2421
+Subproject commit 837344b00224c0e16bae292ed5f3931b1717d4f0
diff --git a/plugins/builtin/source/pattern_drawer.cpp b/plugins/builtin/source/pattern_drawer.cpp
index f734bc871..db5a8fe30 100644
--- a/plugins/builtin/source/pattern_drawer.cpp
+++ b/plugins/builtin/source/pattern_drawer.cpp
@@ -102,7 +102,7 @@ namespace hex {
     }
 
     void PatternDrawer::visit(pl::ptrn::PatternBoolean& pattern) {
-        this->createDefaultEntry(pattern, pattern.getFormattedValue(), static_cast<bool>(pattern.getValue()));
+        this->createDefaultEntry(pattern, pattern.getFormattedValue(), bool(hex::get_or<u128>(pattern.getValue(), 0x00)));
     }
 
     void PatternDrawer::visit(pl::ptrn::PatternCharacter& pattern) {
@@ -126,9 +126,9 @@ namespace hex {
 
     void PatternDrawer::visit(pl::ptrn::PatternFloat& pattern) {
         if (pattern.getSize() == 4) {
-            this->createDefaultEntry(pattern, pattern.getFormattedValue(), static_cast<float>(pattern.getValue()));
+            this->createDefaultEntry(pattern, pattern.getFormattedValue(), pattern.getValue());
         } else if (pattern.getSize() == 8) {
-            this->createDefaultEntry(pattern, pattern.getFormattedValue(), static_cast<double>(pattern.getValue()));
+            this->createDefaultEntry(pattern, pattern.getFormattedValue(), pattern.getValue());
         }
     }
 
@@ -238,7 +238,7 @@ namespace hex {
     }
 
     void PatternDrawer::visit(pl::ptrn::PatternWideCharacter& pattern) {
-        this->createDefaultEntry(pattern, pattern.getFormattedValue(), u128(pattern.getValue()));
+        this->createDefaultEntry(pattern, pattern.getFormattedValue(), pattern.getValue());
     }
 
     void PatternDrawer::visit(pl::ptrn::PatternWideString& pattern) {