fix upcomming tasks