Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.486 -r1.487
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	12 Aug 2015 15:17:37 -0000	1.486
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 Aug 2015 16:50:53 -0000	1.487
@@ -1485,17 +1485,23 @@
   #
   Page instproc set_resolve_context {-package_id:required -parent_id:required -item_id} {
     if {[my set parent_id] != $parent_id} {
-      my set physical_parent_id [my set parent_id]
+      if {![my exists physical_parent_id]} {
+        my set physical_parent_id [my set parent_id]
+      }
       my set parent_id $parent_id
     }
     if {[my set package_id] != $package_id} {
-      my set physical_package_id [my set package_id]
+      if {![my exists physical_package_id]} {
+        my set physical_package_id [my set package_id]
+      }
       my set package_id $package_id
       #my msg "doing extra require on [my set physical_package_id]"
       #::xowiki::Package require [my set physical_package_id]
     }
     if {[info exists item_id] && [my item_id] != $item_id} {
-      my set physical_item_id [my set item_id]
+      if {![my exists physical_item_id]} {
+        my set physical_item_id [my set item_id]
+      }
       my set item_id $item_id
     }
   }