Fix the page load problems in CurrentPage.
Fix the page load problems in CurrentPage.

nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus,nicholasryan/CorePlus