Fixes an issue where waitgroups were used erroneously, which could lead to waitgroup being added to while wait was already invoked.