Fixed broken tasks