Fixed failing of sub pages