diff --git a/CHANGELOG.md b/CHANGELOG.md
index 433e8967a..ba0a85de9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Clixon Changelog
 
+* [6.3.1](#631) 14 August 2023
 * [6.3.0](#630) 29 July 2023
 * [6.2.0](#620) 30 April 2023
 * [6.1.0](#610) 19 Feb 2023
@@ -40,6 +41,14 @@
 * [3.3.2](#332) Aug 27 2017
 * [3.3.1](#331) June 7 2017
 
+## 6.3.1
+14 August 2023
+
+### Corrected Bugs
+
+* Fixed: [Openconfig configuration on Juniper MX does not work](https://github.com/clicon/clixon-controller/issues/20)
+* Fixed: [Configuring Juniper PTX produces CLI errors](https://github.com/clicon/clixon-controller/issues/19)
+
 ## 6.3.0
 29 July 2023
 
diff --git a/lib/src/clixon_yang_parse_lib.c b/lib/src/clixon_yang_parse_lib.c
index 90ae7e4ee..6261a2333 100644
--- a/lib/src/clixon_yang_parse_lib.c
+++ b/lib/src/clixon_yang_parse_lib.c
@@ -179,8 +179,12 @@ ys_grouping_resolve(yang_stmt  *yuses,
     else { 
         ys = yuses;         /* Check upwards in hierarchy for matching groupings */
         while (1){
-            if ((yp = yang_parent_get(ys)) == NULL)
-                break;
+            if (ys->ys_mymodule){
+                yp = ys->ys_mymodule;
+            }
+            else
+                if ((yp = yang_parent_get(ys)) == NULL)
+                    break;
             if ((keyw = yang_keyword_get(yp)) == Y_SPEC)
                 break;
             else if (keyw == Y_MODULE || keyw == Y_SUBMODULE){ /* Try submodules */