diff --git a/cloudwatch.tf b/cloudwatch.tf
index 102a381..c1c9613 100644
--- a/cloudwatch.tf
+++ b/cloudwatch.tf
@@ -38,8 +38,9 @@ resource "aws_cloudwatch_event_rule" "ec2_rule" {
 }
 
 resource "aws_cloudwatch_event_target" "ec2_target" {
-  count     = var.create ? 1 : 0
-  target_id = local.name
+  count = var.create ? 1 : 0
+  #  target_id = local.name
+  target_id = var.create ? aws_lambda_function.lambda[0].function_name : null
   arn       = var.create ? aws_lambda_function.lambda[0].arn : null
   rule      = var.create ? aws_cloudwatch_event_rule.ec2_rule[0].name : null
   #  propagate_tags = true
@@ -52,12 +53,11 @@ resource "aws_cloudwatch_event_target" "ec2_target" {
 }
 
 resource "aws_lambda_permission" "allow_cloudwatch" {
-  count        = var.create ? 1 : 0
-  statement_id = local.name
-  #  statement_id  = 45
+  count         = var.create ? 1 : 0
+  statement_id  = "AllowExecutionFromCloudWatch"
   action        = "lambda:InvokeFunction"
   function_name = var.create ? aws_lambda_function.lambda[0].function_name : null
   principal     = "events.amazonaws.com"
   source_arn    = var.create ? aws_cloudwatch_event_rule.ec2_rule[0].arn : null
-  qualifier     = var.create ? aws_lambda_alias.lambda[0].name : null
+  #  qualifier     = var.create ? aws_lambda_alias.lambda[0].name : null
 }
diff --git a/version.tf b/version.tf
index e6e07bd..4e8c3aa 100644
--- a/version.tf
+++ b/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "0.0.12"
+  _module_version = "0.0.13"
 }