change templates fix 2