fixes task 6341