fixes task 6375