diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 7496d2d5a..8897e9992 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -748,7 +748,7 @@ sub initialize( $;$$) {
 		    TC_SCRIPT               => '',
 		    EXPORT                  => 0,
 		    KLUDGEFREE              => '',
-		    VERSION                 => "5.1.4-Beta1",
+		    VERSION                 => "5.1.3",
 		    CAPVERSION              => 50100 ,
 		    BLACKLIST_LOG_TAG       => '',
 		    RELATED_LOG_TAG         => '',
@@ -3772,8 +3772,6 @@ sub read_a_line($) {
 
 	while ( <$currentfile> ) {
 	    chomp;
-
-	    $currentlinenumber = $. unless $currentlinenumber;
 	    #
 	    # Handle directives
 	    #
@@ -3787,6 +3785,8 @@ sub read_a_line($) {
 		$directive_callback->( 'OMITTED', $_ ) if ( $directive_callback );
 		next;
 	    }
+
+	    $currentlinenumber = $. unless $currentlinenumber;
 	    #
 	    # Suppress leading whitespace in certain continuation lines
 	    #
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 1868d5217..e32e1b4a7 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -442,6 +442,8 @@ if [ -z "$first_install" ]; then
 	delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_REJECT
 	delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Drop
 	delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Reject
+	delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Drop
+	delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Reject
     fi
 fi