Fix for new page bug