bugFix: C4236 т.3

Change-Id: Icb833bfc34472b3f8a5cb58ed27a695d8244a78b