diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 453da4ee37..394a2075df 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=31
+PKG_RELEASE:=32
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index ab58201e24..84e07e0e25 100644
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -12,7 +12,7 @@ fw__uci_state_add() {
 		val="${val:+$val${e1:+ }}$e1"
 	done
 
-	uci_toggle_state $var "$val"
+	uci_toggle_state firewall core $var "$val"
 }
 
 fw__uci_state_del() {
@@ -28,7 +28,7 @@ fw__uci_state_del() {
 		rest="${rest:+$rest${e1:+ }}$e1"
 	done
 
-	uci_toggle_state $var "$val"
+	uci_toggle_state firewall core $var "$val"
 }
 
 fw_configure_interface() {