diff --git a/Telegram/SourceFiles/lang/lang_values.h b/Telegram/SourceFiles/lang/lang_values.h
index 46bf7d016f95dd..467e3abcb9db35 100644
--- a/Telegram/SourceFiles/lang/lang_values.h
+++ b/Telegram/SourceFiles/lang/lang_values.h
@@ -69,7 +69,7 @@ struct ReplaceUnwrap<Tag, Tags...> {
 			Type accumulated,
 			const Value &value,
 			const Values &...values) {
-		return ReplaceUnwrap<Tags...>::template Call(
+		return ReplaceUnwrap<Tags...>::Call(
 			ReplaceTag<Type>::Call(
 				std::move(accumulated),
 				TagValue<Tag>(),
@@ -92,7 +92,7 @@ struct Producer {
 
 	template <typename P, typename ...Values>
 	[[nodiscard]] static S<P> Current(ushort base, P p, const Values &...values) {
-		return ReplaceUnwrap<Tags...>::template Call(
+		return ReplaceUnwrap<Tags...>::Call(
 			p(Lang::details::Current(base)),
 			values...);
 	}
@@ -161,7 +161,7 @@ struct Producer<lngtag_count, Tags...> {
 			float64 count,
 			const Values &...values) {
 		auto plural = Plural(base, count, type);
-		return ReplaceUnwrap<Tags...>::template Call(
+		return ReplaceUnwrap<Tags...>::Call(
 			ReplaceTag<S<P>>::Call(
 				p(Lang::details::Current(base + plural.keyShift)),
 				TagValue<lngtag_count>(),
diff --git a/Telegram/codegen b/Telegram/codegen
index 0af13612408336..25301a3c1e899f 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 0af136124083369073b8fdaf45f0816fd2b10bad
+Subproject commit 25301a3c1e899f218e79f6727bc7dd96036da982