diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index 4e75f6db9..87a65cf57 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -953,7 +953,11 @@ sub finish_chain_section ($$$) {
 		    
 		    $target = ensure_audit_chain( $target ) if ( $targets{$target} || 0 ) & AUDIT;
 
-		    add_ijump( $chainref, g => $target, state_imatch $_ );
+		    if ( $statetable{$_}[2] ) {
+			add_ijump( $chainref, g => $target, state_imatch $_ );
+		    } else {
+			add_ijump( $chainref, j => $target, state_imatch $_ );
+		    }
 		}
 
 		delete $state{$_};