--- gforth/source.fs	1997/03/04 17:49:55	1.4
+++ gforth/source.fs	1997/07/31 16:17:10	1.6
@@ -26,8 +26,8 @@
 require struct.fs
 
 struct
-    1 cells: field sourcepos-name#
-    1 cells: field sourcepos-line#
+    cell% field sourcepos-name#
+    cell% field sourcepos-line#
 end-struct sourcepos
     
 : sourcepos, ( -- )
@@ -36,7 +36,7 @@ end-struct sourcepos
 
 : get-sourcepos ( a-addr -- c-addr u n )
     \ c-addr u is the filename, n is the line number
-    included-files 2@ drop over sourcepos-name# @ 2* cells + 2@
+    dup sourcepos-name# @ loadfilename#>str
     rot sourcepos-line# @ ;
 
 : print-sourcepos ( a-addr -- )