fix tasks 606 620 621