fix task handler