fixes task 16588