change templates fix 6