[TAC-156] remove warning - and so potentials bugs