Correct template issue