[fix] Better template shizzle