#1036 reapply WAVE fixes