template issue fix