Fix template more