diff --git a/src/fp/fp0500.cpp b/src/fp/fp0500.cpp
index 744337660..1ac1f9d2c 100644
--- a/src/fp/fp0500.cpp
+++ b/src/fp/fp0500.cpp
@@ -190,13 +190,14 @@ void TMancati_mask::fill()
 		if(!check_doc_filter(doc))
 				continue;
 
-		if (!chiave_paf(doc, hfatt, bfatt) || !paf0100f.search(nullptr, hfatt, bfatt) || paf0100f.sq_get("P1_GESTIONE") != "N" && paf0100f.sq_get("P1_ERREST") != "M")
+		if (!chiave_paf(doc, hfatt, bfatt) || !paf0100f.search(nullptr, hfatt, bfatt) || paf0100f.sq_get("P1_GESTIONE") != "N")
 		{
 			continue;
 		}
-		if (filter_selected == "" && paf0100f.sq_get("P1_ERRINT") != MANCATA_SEND
+		if (paf0100f.sq_get("P1_ERREST") == "M" && (
+				filter_selected.empty() && paf0100f.sq_get("P1_ERRINT") != MANCATA_SEND
 			|| filter_selected == "S" && paf0100f.sq_get("P1_ERRINT") == MANCATA_SEND
-			|| filter_selected == "A")
+			|| filter_selected == "A") )
 		{
 			TToken_string& row = docs.row(-1);