[TAC-156] some little optimization