Page bug fix