Master page bug fix