change templates fix 15