diff --git a/udpecho/Makefile b/udpecho/Makefile
index 8969971c4..030a7d8cb 100755
--- a/udpecho/Makefile
+++ b/udpecho/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.3
+PKG_VERSION:=2.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/udpecho/files/etc/init.d/udpechoserverd b/udpecho/files/etc/init.d/udpechoserverd
index 9bb30dd3a..f2cae4eaf 100755
--- a/udpecho/files/etc/init.d/udpechoserverd
+++ b/udpecho/files/etc/init.d/udpechoserverd
@@ -37,11 +37,11 @@ start_service() {
 stop_service() {
 	# Remove the USPechoserver ports created earlier
 	while iptables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
-		iptables -D zone_wan_input $(iptables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+		iptables -D zone_wan_input "$(iptables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}')";
 	done
 
 	while ip6tables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
-		ip6tables -D zone_wan_input $(ip6tables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+		ip6tables -D zone_wan_input "$(ip6tables -nL zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}')";
 	done
 
 	plus_enable="$(uci -q -c /var/state get udpechoserver.udpechoserver.plus)"