diff --git a/spkl/SparkleXrm.Tasks.Tests/ImportCodeTests.cs b/spkl/SparkleXrm.Tasks.Tests/ImportCodeTests.cs
index 57c75fc..44bfe2c 100644
--- a/spkl/SparkleXrm.Tasks.Tests/ImportCodeTests.cs
+++ b/spkl/SparkleXrm.Tasks.Tests/ImportCodeTests.cs
@@ -60,7 +60,7 @@ public void CreateAsyncPluginAttributeCode()
 
             var code = attribute.GetAttributeCode("");
             Debug.WriteLine(code);
-            Assert.AreEqual(Normalise("[CrmPluginRegistration(\"Update\",\"account\",StageEnum.PostOperation,ExecutionModeEnum.Asynchronous,\"name, address1_line1\",\"Deleteofaccount\",1,IsolationModeEnum.Sandbox,Image1Type=ImageTypeEnum.PreImage,Image1Name=\"PreImage\",Image1Attributes=\"name, address1_line1\",Image2Type=ImageTypeEnum.PostImage,Image2Name=\"PostImage\",Image2Attributes=\"name, address1_line1\",DeleteAsyncOperation = True)]"), Normalise(code));
+            Assert.AreEqual(Normalise("[CrmPluginRegistration(\"Update\",\"account\",StageEnum.PostOperation,ExecutionModeEnum.Asynchronous,\"name, address1_line1\",\"Deleteofaccount\",1,IsolationModeEnum.Sandbox,Image1Type=ImageTypeEnum.PreImage,Image1Name=\"PreImage\",Image1Attributes=\"name, address1_line1\",Image2Type=ImageTypeEnum.PostImage,Image2Name=\"PostImage\",Image2Attributes=\"name, address1_line1\",DeleteAsyncOperation = true)]"), Normalise(code));
         }
 
         [TestMethod]
diff --git a/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs b/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs
index 00254c8..61de9b5 100644
--- a/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs
+++ b/spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs
@@ -157,7 +157,7 @@ public static string GetAttributeCode(this CrmPluginRegistrationAttribute attrib
                 additionalParmeters += indentation + ",Id = \"" + attribute.Id + "\"";
 
             if (attribute.ExecutionMode == ExecutionModeEnum.Asynchronous && attribute.DeleteAsyncOperation == true)
-                additionalParmeters += indentation + ",DeleteAsyncOperation = " + attribute.DeleteAsyncOperation;
+                additionalParmeters += indentation + ",DeleteAsyncOperation = true";
 
             if (attribute.UnSecureConfiguration != null)
                 additionalParmeters += indentation + ",UnSecureConfiguration = @\"" + attribute.UnSecureConfiguration.Replace("\"","\"\"") + "\"";
diff --git a/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs b/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs
index 6336a94..b17808c 100644
--- a/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs
+++ b/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs
@@ -187,7 +187,7 @@ private void AddPluginAttributes(OrganizationServiceContext ctx, CodeParser pars
                             )
                         {
                             Id = step.Id.ToString(),
-                            DeleteAsyncOperation = step.Mode.Value != 0 && step.AsyncAutoDelete.Value,
+                            DeleteAsyncOperation = step.Mode.Value != 0 && (step.AsyncAutoDelete ?? false),
                         };
                     }
 
diff --git a/spkl/SparkleXrm.Tasks/Tasks/Queries.cs b/spkl/SparkleXrm.Tasks/Tasks/Queries.cs
index f846afc..5e10606 100644
--- a/spkl/SparkleXrm.Tasks/Tasks/Queries.cs
+++ b/spkl/SparkleXrm.Tasks/Tasks/Queries.cs
@@ -25,6 +25,7 @@ on s.SdkMessageId.Id equals m.SdkMessageId
                         SdkMessageProcessingStepId = s.SdkMessageProcessingStepId,
                         Name = s.Name,
                         Mode = s.Mode,
+                        AsyncAutoDelete = s.AsyncAutoDelete,
                         FilteringAttributes = s.FilteringAttributes,
                         Rank = s.Rank,
                         Stage = s.Stage,