fixes task 6340