diff --git a/lithos_c/inc/Lth_tokenstream.h b/lithos_c/inc/Lth_tokenstream.h
index 660d4f2..77a295b 100644
--- a/lithos_c/inc/Lth_tokenstream.h
+++ b/lithos_c/inc/Lth_tokenstream.h
@@ -36,11 +36,11 @@ bool             Lth_TokenStreamDrop(struct Lth_TokenStream *stream, Lth_TokenTy
 // Lth_TokenStream
 //
 // internal data
-//    fp
 //    tokbuf
 //    filled
 //
 // read-write
+//    fp:      File that the token stream is parsing.
 //    skipeol: Skip line end tokens.   Defaults to true.
 //    skipspc: Skip whitespace tokens. Defaults to true.
 //
@@ -51,10 +51,10 @@ typedef struct Lth_TokenStream
    __prop peek  {call: Lth_TokenStreamPeek(this)}
    __prop drop  {call: Lth_TokenStreamDrop(this)}
    
-   FILE     *fp;
    Lth_Token tokbuf;
    bool      filled;
 
+   FILE     *fp;
    bool skipeol;
    bool skipspc;
 } Lth_TokenStream;
diff --git a/lithos_c/src/tokenstream.c b/lithos_c/src/tokenstream.c
index 5e860e9..a78cc98 100644
--- a/lithos_c/src/tokenstream.c
+++ b/lithos_c/src/tokenstream.c
@@ -82,7 +82,7 @@ static ssize_t Lth_TokenFileStream_read(void *cookie_, char *buf, size_t size)
          cookie->bumpc();
          if(cookie->getc() == '*')
          {
-            for(cookie->bumpc(); !(cookie->bumpc() == '*' && cookie->getc() == '/');)
+            for(cookie->bumpc(); !(cookie->bumpc() == '*' && cookie->bumpc() == '/');)
                if(cookie->getc() == EOF)
                   return i;
             buf[i++] = ' ';