bug fixed, edit proper tasks