change templates fix 14