diff --git a/include/plasp/utils/Parser.h b/include/plasp/utils/Parser.h
index 67f6761..8a16e75 100644
--- a/include/plasp/utils/Parser.h
+++ b/include/plasp/utils/Parser.h
@@ -33,6 +33,9 @@ struct Tag
 template<class ParserPolicy = CaseSensitiveParserPolicy>
 class Parser: public Stream, public ParserPolicy
 {
+	template<class OtherParserPolicy>
+	friend class Parser;
+
 	public:
 		explicit Parser();
 		explicit Parser(std::string streamName, std::istream &istream);
diff --git a/include/plasp/utils/Stream.h b/include/plasp/utils/Stream.h
index 262783b..ef6f780 100644
--- a/include/plasp/utils/Stream.h
+++ b/include/plasp/utils/Stream.h
@@ -70,8 +70,7 @@ class Stream
 
 		void check() const;
 
-	// TODO: make protected again
-	//protected:
+	protected:
 		mutable std::stringstream m_stream;
 
 		std::vector<Delimiter> m_delimiters;