Mirror template bug fix