diff --git a/FitConnect/Subscriber.cs b/FitConnect/Subscriber.cs
index c87f3a49f66ad4fb660190f46296dd7ca4758bef..aa80bc9508c66249485f35694e0f7f934acb4834 100644
--- a/FitConnect/Subscriber.cs
+++ b/FitConnect/Subscriber.cs
@@ -125,6 +125,7 @@ public class Subscriber : FitConnectClient,
 
     private SecurityEventToken CheckSubmitEvent(Submission submission) {
         var status = GetStatusForSubmission(submission);
+        // TODO: Two different problems more than 1 and no tag
         if (status.Count(set => set.EventType == EventType.Submit) != 1) {
             RejectSubmission(submission, Problems.SchemaViolation);
             throw new Exception("More than one or none submit event found");
@@ -158,7 +159,6 @@ public class Subscriber : FitConnectClient,
             }
 
             foreach (var attachment in submission.Attachments) {
-                // BUG: Attachment.ID is wrong set
                 if (attachmentSignatures?[attachment.Id] != attachment.AttachmentAuthentication) {
                     RejectSubmission(submission, Problems.IncorrectAuthenticationTag);
                     throw new AggregateException("Attachment signature mismatch");