Fix one issue. Still have blocking issue when waiting for other tasks