fixes task 6374