Fix Abort() with wait()