change templates fix 16