[TAC-96] little refactoring
[TAC-96] solve brain bug