diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index cf700324..a6fa5f1b 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -62,11 +62,13 @@ function __powerline_prompt_command {
 	SEGMENTS_AT_LEFT=0
 	SEGMENTS_AT_RIGHT=0
 	LAST_SEGMENT_COLOR=""
+
 	_save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
 	## left prompt ##
 	for segment in $POWERLINE_LEFT_PROMPT; do
-		local info="$(__powerline_"${segment}"_prompt)"
+		local info
+		info="$(__powerline_"${segment}"_prompt)"
 		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
 	done
 
@@ -80,7 +82,8 @@ function __powerline_prompt_command {
 	if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
 		# LEFT_PROMPT+="${move_cursor_rightmost}"
 		for segment in $POWERLINE_RIGHT_PROMPT; do
-			local info="$(__powerline_"${segment}"_prompt)"
+			local info
+			info="$(__powerline_"${segment}"_prompt)"
 			[[ -n "${info}" ]] && __powerline_right_segment "${info}"
 		done
 
diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index 3859e258..2dc25c9c 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -28,6 +28,7 @@ function __powerline_left_segment {
 	LEFT_PROMPT+="$(set_color "${params[1]}" -)${pad_before_segment}${params[0]}${normal}"
 	LAST_SEGMENT_COLOR=${params[1]}
 	((SEGMENTS_AT_LEFT += 1))
+
 	_save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 }
 
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index ce4fc290..09c197a8 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -274,6 +274,7 @@ function __powerline_prompt_command() {
 	LEFT_PROMPT=""
 	SEGMENTS_AT_LEFT=0
 	LAST_SEGMENT_COLOR=""
+
 	save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
 	if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then