subpages fix take 2