Fix for WAV crashes