diff --git a/hipamd/bin/hipdemangleatp b/hipamd/bin/hipdemangleatp
index f979f59434..456ea9ae15 100755
--- a/hipamd/bin/hipdemangleatp
+++ b/hipamd/bin/hipdemangleatp
@@ -5,7 +5,7 @@
 # HIP kernels
 kernels=$(grep grid_launch_parm $1 | cut -d" " -f1 | sort | uniq)
 for mangled_sym in $kernels; do
-    real_sym=$(c++filt -p $(c++filt _$mangled_sym | cut -d: -f3 | sed 's/_functor//g'))
+    real_sym=$(c++filt -p $(c++filt _$mangled_sym | cut -d: -f3 | sed 's/_functor//g' | sed 's/ /\\\&nbsp/g'))
     #echo "$mangled_sym => $real_sym" >> $1.log
     sed -i "s/$mangled_sym/$real_sym/g" $1
 done
@@ -13,7 +13,7 @@ done
 # HC kernels
 kernels=$(grep cxxamp_trampoline $1 | cut -d" " -f1 | sort | uniq)
 for mangled_sym in $kernels; do
-    real_sym=$(echo $mangled_sym |  sed "s/^/_/g; s/_EC_/_$/g" | c++filt -p | cut -d\( -f1 | cut -d" " -f1 --complement)
+    real_sym=$(echo $mangled_sym |  sed "s/^/_/g; s/_EC_/_$/g" | c++filt -p | cut -d\( -f1 | cut -d" " -f1 --complement | sed 's/ /\\\&nbsp/g')
     #echo "$mangled_sym => $real_sym" >> $1.log
     sed -i "s/$mangled_sym/$real_sym/g" $1
 done