diff --git a/tools/neutron.bash_completion b/tools/neutron.bash_completion
index 3e542e0..aa8e4e4 100644
--- a/tools/neutron.bash_completion
+++ b/tools/neutron.bash_completion
@@ -10,9 +10,9 @@ _neutron()
 
 	if [ "x$_neutron_opts" == "x" ] ; then
 		nbc="`neutron bash-completion`"
-		_neutron_opts="`echo "$nbc" | sed -e "s/--[a-z0-9_-]*//g" -e "s/\s\s*/ /g"`"
-		_neutron_flags="`echo " $nbc" | sed -e "s/ [^-][^-][a-z0-9_-]*//g" -e "s/\s\s*/ /g"`"
-		_neutron_opts_exp="`echo "$_neutron_opts" | sed -e "s/\s/|/g"`"
+		_neutron_opts="`echo "$nbc" | sed -e "s/--[a-z0-9_-]*//g" -e "s/[ ][ ]*/ /g"`"
+		_neutron_flags="`echo " $nbc" | sed -e "s/ [^-][^-][a-z0-9_-]*//g" -e "s/[ ][ ]*/ /g"`"
+		_neutron_opts_exp="`echo "$_neutron_opts" | sed -e "s/[ ]/|/g"`"
 	fi
 
 	if [[ " ${COMP_WORDS[@]} " =~ " "($_neutron_opts_exp)" " && "$prev" != "help" ]] ; then