master page bug fix