Final fix for whisper