fixed task 16890