diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 9c148c0c..0fee637f 100644
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -9377,3 +9377,10 @@ Makefile.in
 	- pipesize.h: add dependency on ${BUILTINS_LIBRARY} to avoid parallel
 	  makes trying to create it twice. Report and fix from
 	  Richard Purdie <richard.purdie@linuxfoundation.org>
+
+				   1/21
+				   ----
+subst.c
+	- param_expand: if a nameref expands to array[@] or array[*], make sure
+	  to call chk_atstar so the right variables are set to split the
+	  result. Report from Oguz <oguzismailuysal@gmail.com>
diff --git a/subst.c b/subst.c
index f6e16e8d..d7b5a6b6 100644
--- a/subst.c
+++ b/subst.c
@@ -7221,18 +7221,30 @@ parameter_brace_expand_rhs (name, value, op, quoted, pflags, qdollaratp, hasdoll
   if (vname != name)
     free (vname);
 
+#if 0 /* TAG:bash-5.2 oguzismailuysal@gmail.com 01/20/2021 */
+  /* "In all cases, the final value of parameter shall be substituted." */
+  if (shell_compatibility_level > 51)
+    {
+      FREE (t1);
+      t1 = value_cell (v);
+    }
+#endif
+
   /* From Posix group discussion Feb-March 2010.  Issue 7 0000221 */
 
   /* If we are double-quoted or if we are not going to be performing word
      splitting, we want to quote the value we return appropriately, like
      the other expansions this function handles. */
   w->word = (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) ? quote_string (t1) : quote_escapes (t1);
-  /* If we have something that's non-null, that's not a quoted null string,
+  /* If we have something that's non-null, but not a quoted null string,
      and we're not going to be performing word splitting (we know we're not
      because the operator is `='), we can forget we saw a quoted null. */
   if (w->word && w->word[0] && QUOTED_NULL (w->word) == 0)
     w->flags &= ~W_SAWQUOTEDNULL;
+
+#if 1 /* TAG:bash-5.2 */
   free (t1);
+#endif
 
   /* If we convert a null string into a quoted null, make sure the caller
      knows it. */
@@ -9126,7 +9138,7 @@ parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, conta
       dispose_word_desc (tdesc);
     }
   else
-    temp = (char  *)0;
+    temp = (char *)0;
 
   if (temp == &expand_param_error || temp == &expand_param_fatal)
     {
@@ -9956,6 +9968,7 @@ comsub:
 #if defined (ARRAY_VARS)
 	  if (temp && *temp && valid_array_reference (temp, 0))
 	    {
+	      chk_atstar (temp, quoted, pflags, quoted_dollar_at_p, contains_dollar_at);
 	      tdesc = parameter_brace_expand_word (temp, SPECIAL_VAR (temp, 0), quoted, pflags, (arrayind_t *)NULL);
 	      if (tdesc == &expand_wdesc_error || tdesc == &expand_wdesc_fatal)
 		return (tdesc);
diff --git a/tests/nameref.right b/tests/nameref.right
index 7b254ba1..83e9ee5b 100644
--- a/tests/nameref.right
+++ b/tests/nameref.right
@@ -428,6 +428,23 @@ declare -a var=([123]="")
 declare -n ref="var[123]"
 ./nameref18.sub: line 67: declare: var[123]: not found
 declare -a var=([123]="X")
+argv[1] = <1>
+argv[2] = <2>
+argv[3] = <3>
+argv[1] = <1>
+argv[2] = <2>
+argv[3] = <3>
+argv[1] = <1>
+argv[2] = <2>
+argv[3] = <3>
+argv[1] = <1>
+argv[2] = <2>
+argv[3] = <3>
+argv[1] = <1>
+argv[2] = <2>
+argv[3] = <31>
+argv[4] = <2>
+argv[5] = <3>
 declare -n foo="bar"
 declare -- foo="bar"
 ./nameref19.sub: line 22: declare: bar: not found
diff --git a/tests/nameref18.sub b/tests/nameref18.sub
index a29fe379..7a32877f 100644
--- a/tests/nameref18.sub
+++ b/tests/nameref18.sub
@@ -65,3 +65,19 @@ declare -p ref ${!ref} var
 declare +t ref
 ref=X
 declare -p ref ${!ref} var
+
+unset -n ref
+unset var
+
+arr=(1 2 3)
+
+indir='arr[@]'
+declare -n ref='arr[@]'
+
+recho "${!indir}"
+recho ${!indir}
+
+recho "$ref"
+recho $ref
+
+recho "${!indir}$ref"