Third attempted fix for the uninitialized waiters field