fixed task 16586