Fixing the overwrite of waves