fixing layout/page context issue from #424