diff --git a/VERSION b/VERSION
index 13c80e8c0..33c06d34d 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=1
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3587"
+BUILD_NUM="3588"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 3728e4d33..a05f3ed4f 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "5.0.1.3587"
+#define VERSION      "5.0.1.3588"
 #define GENERATION   "5.0"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 8ad340ef4..a9ba0deac 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 5.0.1.3587
+%define version 5.0.1.3588
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 21404e432..b0de39f6a 100644
--- a/packaging/fwbuilder.control
+++ b/packaging/fwbuilder.control
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 5.0.1.3587-1
+Version: 5.0.1.3588-1
 Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 6b1110734..12b767895 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 5.0.1.3587
+%define version 5.0.1.3588
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp b/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
index 34187e052..49b5a1df4 100644
--- a/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
@@ -75,6 +75,7 @@ Inet6AddrMask::Inet6AddrMask(const string &s) throw(FWException) :
     
     broadcast_address = new InetAddr();
     network_address = new InetAddr();
+    last_host = new InetAddr();
     setNetworkAndBroadcastAddress();
 }
 
@@ -85,6 +86,7 @@ Inet6AddrMask::Inet6AddrMask(const InetAddr &a, const InetAddr &n) :
     netmask = new InetAddr(AF_INET6, n.getLength());
     broadcast_address = new InetAddr();
     network_address = new InetAddr();
+    last_host = new InetAddr();
     setNetworkAndBroadcastAddress();
 }
 
diff --git a/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.cpp b/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.cpp
index a05a917fa..918782792 100644
--- a/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.cpp
+++ b/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.cpp
@@ -156,11 +156,13 @@ void GeneratedScriptTest::CheckUtilitiesTest()
     QStringList utils;
 
     QStringList test1_utils;
+    test1_utils << "find_program which";
     test1_utils << "find_program $IPTABLES";
     test1_utils << "find_program $MODPROBE";
     test1_utils << "find_program $IP";
 
     QStringList test2_utils;
+    test2_utils << "find_program which";
     test2_utils << "find_program $IPTABLES";
     test2_utils << "find_program $IPTABLES_RESTORE";
     test2_utils << "find_program $MODPROBE";