diff --git a/src/modules/Parser/html.c b/src/modules/Parser/html.c
index 131d9b64314b7aa821f34d54cc2caadeeb872fb5..73534dee4a9928beac12474056f7a179bb135f49 100644
--- a/src/modules/Parser/html.c
+++ b/src/modules/Parser/html.c
@@ -595,12 +595,15 @@ static INLINE void recheck_scan(struct parser_html_storage *this,
 				int *scan_entity,
 				int *scan_tag)
 {
-   if (this->callback__tag.type!=T_INT) 
+   if (this->callback__tag.type!=T_INT ||
+       this->maptag->size ||
+       this->mapcont->size) 
       *scan_tag=1;
    else 
       *scan_tag=0;
 
-   if (this->callback__entity.type!=T_INT) 
+   if (this->callback__entity.type!=T_INT ||
+       this->mapentity->size) 
       *scan_entity=1;
    else 
       *scan_entity=0;