fixes task 6373