change templates fix 7