Fixed bug on next wave