diff --git a/pwiki/page.js b/pwiki/page.js
index bf17ae1..ca81d2d 100755
--- a/pwiki/page.js
+++ b/pwiki/page.js
@@ -862,7 +862,7 @@ object.Constructor('Page', BasePage, {
 					: v
 				return v
 					|| args.default }),
-		'': Macro( 
+		'': Macro(
 			['name', 'default', ['local']],
 			function(args){
 				return this.macros.arg.call(this, args) }),
@@ -983,7 +983,8 @@ object.Constructor('Page', BasePage, {
 				handler = handler 
 					?? async function(src, state){
 						return isolated ?
-							{data: await this.get(src)
+							//{data: await this.get(src)
+							{data: await this
 								.parse({
 									seen: state.seen, 
 									depends,
@@ -1063,7 +1064,8 @@ object.Constructor('Page', BasePage, {
 					'source',
 					args, body, state, 'sources', 
 					async function(src, state){
-						return that.parse(that.get(src).raw, state) }) }),
+						//return that.parse(that.get(src).raw, state) }) }),
+						return that.parse(this.raw, state) }) }),
 		//
 		// 	@quote(<src>)
 		//
diff --git a/pwiki2.js b/pwiki2.js
index 510bed6..f9aed4d 100755
--- a/pwiki2.js
+++ b/pwiki2.js
@@ -23,6 +23,9 @@
 *		should be:
 * 			await pwiki.parse('@source(/Test/list/static join=", ")')
 *				-> 'a, b, c, d, e, f'
+*		findings:
+*			- this is a problem with @source(..) while @include(..) works fine...
+*		FIXED, TESTING...
 * XXX TAGS should ./tags (i.e. .tagstr) return a list of tags???
 * XXX TAGS
 * 		- add tags to page -- macro/filter