- Fix waitgroup race condition