Revert "make so that won't break when no current page"

This reverts commit 8ce20166dbf7cde8c87135962e84a0da75390c9d.