349c349
<             // get rid of 'File module/"
---
>             // get rid of "File module/" or "File "
350a351,352
>             String header = "File " + m_package;
> 
358d359
<                 line = line.substring(headerLength);
359a361,366
>                 if ( line.startsWith( header ) ) {
>                     line = line.substring(headerLength);
>                 } else {
>                     line = line.substring(5);
>                 }
>