diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index 112bfd92d..9c98a9196 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -829,6 +829,10 @@ sub compiler {
     #
     setup_tunnels;
     #
+    # Clear the current filename
+    #
+    clear_currentfilename;
+    #
     # MACLIST Filtration again
     #
     setup_mac_lists 2;
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index b5593a28d..64a84671c 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -48,6 +48,7 @@ our @EXPORT = qw(
 		 fatal_error
 		 assert
 		 currentlineinfo
+		 clear_currentfilename
 
 		 progress_message
 		 progress_message_nocompress
@@ -658,7 +659,7 @@ sub initialize( $;$$) {
 		    EXPORT                  => 0,
 		    KLUDGEFREE              => '',
 		    STATEMATCH              => '-m state --state',
-		    VERSION                 => "4.5.13-Beta3",
+		    VERSION                 => "4.5.18-Beta1",
 		    CAPVERSION              => 40515 ,
 		  );
     #
@@ -2167,6 +2168,13 @@ sub close_file() {
     }
 }
 
+#
+# Clear the current filename
+#
+sub clear_currentfilename() {
+    $currentfilename = '';
+}
+
 #
 # Process an ?IF, ?ELSIF, ?ELSE or ?END directive
 #