diff --git a/query/lambda/lambda_function_restrict_public_access.sql b/query/lambda/lambda_function_restrict_public_access.sql
index bf23e991..11d7fa33 100644
--- a/query/lambda/lambda_function_restrict_public_access.sql
+++ b/query/lambda/lambda_function_restrict_public_access.sql
@@ -1,25 +1,34 @@
+with wildcard_action_policies as (
+  select
+    arn,
+    count(*) as statements_num
+  from
+    aws_lambda_function,
+    jsonb_array_elements(policy_std -> 'Statement') as s
+  where
+    s ->> 'Effect' = 'Allow'
+    and (
+      ( s -> 'Principal' -> 'AWS') = '["*"]'
+      or s ->> 'Principal' = '*'
+    )
+  group by
+    arn
+)
 select
   -- Required Columns
-  arn as resource,
+  f.arn as resource,
   case
-    when policy_std -> 'Statement' ->> 'Effect' = 'Allow'
-    and (
-      policy_std -> 'Statement' ->> 'Principal' = '*'
-      or ( policy_std -> 'Principal' -> 'AWS' ) :: text = '*'
-    ) then 'alarm'
-    else 'ok'
-  end status,
+    when p.arn is null then 'ok'
+    else 'alarm'
+  end as status,
   case
-    when policy_std is null then title || ' has no policy.'
-    when policy_std -> 'Statement' ->> 'Effect' = 'Allow'
-    and (
-      policy_std -> 'Statement' ->> 'Principal' = '*'
-      or ( policy_std -> 'Principal' -> 'AWS' ) :: text = '*'
-    ) then title || ' allows public access.'
-    else title || ' does not allow public access.'
-  end reason,
+    when p.arn is null then title || ' does not allow public access.'
+    else title || ' contains ' || coalesce(p.statements_num,0) ||
+    ' statements that allows public access.'
+  end as reason,
   -- Additional Dimensions
-  region,
-  account_id
+  f.region,
+  f.account_id
 from
-  aws_lambda_function;
+  aws_lambda_function as f
+  left join wildcard_action_policies as p on p.arn = f.arn;
\ No newline at end of file