Fix tasks 618 619