--- a/src/FreeformASN1ContentHandler.h	Tue Jul 27 18:30:24 2021 +0200
+++ b/src/FreeformASN1ContentHandler.h	Tue Jul 27 18:33:27 2021 +0200
@@ -129,12 +129,12 @@
 	}
 
 	void writeStreamEnd() override {
+		Record r(nullptr, position, L"stream-end");
+		write(r);
+		
 		auto id = position.back() + 1;
 		position.pop_back();
 		position.back() = id;
-		// TODO: put end event under the start parent?
-		Record r(nullptr, position, L"stream-end");
-		write(r);
 	}
 
 	void writeCollectionStart(const Header& header) override {
@@ -145,12 +145,12 @@
 	}
 
 	void writeCollectionEnd() override {
+		Record r(nullptr, position, L"collection-end");
+		write(r);
+		
 		auto id = position.back() + 1;
 		position.pop_back();
 		position.back() = id;
-		// TODO: put end event under the start parent?
-		Record r(nullptr, position, L"collection-end");
-		write(r);
 	}
 
 	void writeBitString(const Header& header, std::vector<bool> value) override {