diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java
index 2d02ce798..8b5cd5767 100644
--- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java
+++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/TurtleTests.java
@@ -482,7 +482,7 @@ public class TurtleTests {
   @Test
   public void test_localName_with_assigned_nfc_PN_CHARS_BASE_character_boundariesNT() throws Exception {
     doTest(TestingUtilities.resourceNameToFile("turtle",
-        "localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt"), true);
+        "localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt"), false);
   }
 
   @Test
@@ -523,7 +523,7 @@ public class TurtleTests {
   @Test
   public void test_localName_with_nfc_PN_CHARS_BASE_character_boundariesNT() throws Exception {
     doTest(TestingUtilities.resourceNameToFile("turtle", "localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt"),
-        true);
+        false);
   }
 
   @Test
diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRLexer.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRLexer.java
index fa1ae9469..8f2138ad9 100644
--- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRLexer.java
+++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRLexer.java
@@ -499,7 +499,7 @@ public class FHIRLexer {
           break;
         case 'u':
           i++;
-          int uc = Integer.parseInt(s.substring(i, i+4), 32);
+          int uc = Integer.parseInt(s.substring(i, i+4), 16);
           b.append(Character.toString(uc));
           i = i + 4;
           break;
diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRPathEngine.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRPathEngine.java
index d636537a9..81fe330f8 100644
--- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRPathEngine.java
+++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/fhirpath/FHIRPathEngine.java
@@ -1767,7 +1767,7 @@ public class FHIRPathEngine {
           break;
         case 'u':
           i++;
-          int uc = Integer.parseInt(s.substring(i, i + 4), 32);
+          int uc = Integer.parseInt(s.substring(i, i + 4), 16);
           b.append(Character.toString(uc));
           i = i + 3;
           break;