Wave bugfix