Page Bug fix