Fix not getting right task id