diff --git a/profile.d/toolbox.sh b/profile.d/toolbox.sh
index eed9038..72161d6 100644
--- a/profile.d/toolbox.sh
+++ b/profile.d/toolbox.sh
@@ -83,7 +83,7 @@ if [ -f /run/.containerenv ] \
     if [ "$TERM" != "" ]; then
         error_message="Error: terminfo entry not found for $TERM"
         term_without_first_character="${TERM#?}"
-        term_just_first_character="${TERM%$term_without_first_character}"
+        term_just_first_character="${TERM%"$term_without_first_character"}"
         terminfo_sub_directory="$term_just_first_character/$TERM"
 
         if [ "$TERMINFO" = "" ]; then
diff --git a/toolbox b/toolbox
index 00db6a7..43ffff1 100755
--- a/toolbox
+++ b/toolbox
@@ -569,7 +569,7 @@ image_reference_get_basename()
     image="$1"
 
     domain=$(image_reference_get_domain "$image")
-    remainder=${image#$domain}
+    remainder=${image#"$domain"}
     path=${remainder%:*}
     basename=${path##*/}
     echo "$basename"
@@ -590,7 +590,7 @@ image_reference_get_tag()
     image="$1"
 
     domain=$(image_reference_get_domain "$image")
-    remainder=${image#$domain}
+    remainder=${image#"$domain"}
 
     tag=""
     if (echo "$remainder" | grep ":" >/dev/null 2>&3); then