Execute the task in the Task::wait() method to avoid deadlock. (#436)

Execute the task in the Task::wait() method to avoid deadlock. (#436) #1471