Tasks order fix