--- a/PPNotParser.st	Fri Oct 03 01:59:10 2014 +0100
+++ b/PPNotParser.st	Fri Oct 03 02:33:08 2014 +0100
@@ -10,13 +10,13 @@
 
 !PPNotParser methodsFor:'parsing'!
 
-parseOn: aStream
-	| element position |
-	position := aStream position.
-	element := parser parseOn: aStream.
-	aStream position: position.
+parseOn: aPPContext
+	| element memento |
+	memento := aPPContext remember.
+	element := parser parseOn: aPPContext.
+	aPPContext restore: memento.
 	^ element isPetitFailure
-		ifFalse: [ PPFailure message: '' at: aStream position ]
+		ifFalse: [ PPFailure message: '' context: aPPContext ]
 ! !
 
 !PPNotParser class methodsFor:'documentation'!
@@ -32,3 +32,4 @@
 version_SVN
     ^ '§Id: PPNotParser.st 2 2010-12-17 18:44:23Z vranyj1 §'
 ! !
+