Fix template issue