Fix to initial wave count