diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 4dbd2f3a3..a1aa77337 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "4";
 	public const string Build = "0";
-	public const string Revision = "1673";
+	public const string Revision = "1674";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index f1d41f1a6..dea4e3d96 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%COREVERSION%=0
-%REVISION%=1673
 %MINOR%=4
+%REVISION%=1674
+%COREVERSION%=0
 %MAJOR%=3
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
index 1879dae7f..8c86bb1b3 100644
Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
index 86b58e079..ef301bb58 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
@@ -2,7 +2,7 @@
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
 //  Machine:  DESKTOP-A6LT9RI
-//  DateTime: 12.06.2018 21:27:13
+//  DateTime: 12.06.2018 22:19:29
 //  UserName: ?????????
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
index de0815a4c..4532a00fa 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
@@ -2128,6 +2128,9 @@ proc_func_decl_noclass
 		}
 	| tkFunction func_name fp_list optional_method_modificators1 tkAssign expr_l1 tkSemiColon
 		{
+			if ($6 is dot_question_node)
+				parsertools.AddErrorFromResource("DOT_QUECTION_IN_SHORT_FUN",@6);
+	
 			$$ = SyntaxTreeBuilder.BuildShortFuncDefinition($3 as formal_parameters, $4 as procedure_attributes_list, $2 as method_name, null, $6, @1.Merge(@4));
 		}
 	| tkFunction func_name fp_list tkColon fptype optional_method_modificators1 tkAssign func_decl_lambda tkSemiColon
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
index 633e797ba..c36b7e7ad 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
@@ -2,7 +2,7 @@
 
 // GPPG version 1.3.6
 // Machine:  DESKTOP-A6LT9RI
-// DateTime: 12.06.2018 21:27:14
+// DateTime: 12.06.2018 22:19:30
 // UserName: ?????????
 // Input file <ABCPascal.y>
 
@@ -4370,6 +4370,9 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
                 //                           optional_method_modificators1, tkAssign, expr_l1, 
                 //                           tkSemiColon
 {
+			if (ValueStack[ValueStack.Depth-2].ex is dot_question_node)
+				parsertools.AddErrorFromResource("DOT_QUECTION_IN_SHORT_FUN",LocationStack[LocationStack.Depth-2]);
+	
 			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-5].stn as formal_parameters, ValueStack[ValueStack.Depth-4].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-6].stn as method_name, null, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-7].Merge(LocationStack[LocationStack.Depth-4]));
 		}
         break;
diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
index c18af62cb..146761c0b 100644
--- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc
+++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
@@ -194,5 +194,6 @@ script=
 
 
 
+
 
 
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 4f44966b0..f5b4981f5 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.4.0.1673'
+!define VERSION '3.4.0.1674'
diff --git a/bin/Lng/Eng/PascalABCParser.dat b/bin/Lng/Eng/PascalABCParser.dat
index 15e935157..35d442323 100644
--- a/bin/Lng/Eng/PascalABCParser.dat
+++ b/bin/Lng/Eng/PascalABCParser.dat
@@ -62,4 +62,5 @@ OVERLOAD_IS_NOT_USED=overload is not used in PascalABC.NET
 ONLY_BASE_ASSIGNMENT_FOR_TUPLE=Tuple allows only base assignment :=
 BAD_FORMAT_STRING=Interpolated string has invalid format
 TUPLE_ELEMENTS_COUNT_MUST_BE_LESSEQUAL_7=Count of Tuple elements must be <=7
-TWO_NILS_IN_QUESTION_EXPR=The conditional expression cannot contain nil constants on both branches
\ No newline at end of file
+TWO_NILS_IN_QUESTION_EXPR=The conditional expression cannot contain nil constants on both branches
+DOT_QUECTION_IN_SHORT_FUN=Expression with ?. cannot appear in a short function definition without a return value 
\ No newline at end of file
diff --git a/bin/Lng/Rus/PascalABCParser.dat b/bin/Lng/Rus/PascalABCParser.dat
index fc3335e01..9268ef221 100644
--- a/bin/Lng/Rus/PascalABCParser.dat
+++ b/bin/Lng/Rus/PascalABCParser.dat
@@ -61,4 +61,5 @@ OVERLOAD_IS_NOT_USED=overload не используется в PascalABC.NET
 ONLY_BASE_ASSIGNMENT_FOR_TUPLE=Для кортежа допустимо только обычное присваивание :=
 BAD_FORMAT_STRING=Встречена неправильная форматная строка
 TUPLE_ELEMENTS_COUNT_MUST_BE_LESSEQUAL_7=Количество элементов кортежа не должно быть больше 7 
-TWO_NILS_IN_QUESTION_EXPR=Условное выражение не может содержать константы nil по обеим веткам
\ No newline at end of file
+TWO_NILS_IN_QUESTION_EXPR=Условное выражение не может содержать константы nil по обеим веткам
+DOT_QUECTION_IN_SHORT_FUN=Выражение с ?. не может фигурировать в коротком определении функции без возвращаемого значения
\ No newline at end of file