New Audio Fix

Dupe of #2215 

Please look at that one for STR etc., it just got out of hand after a failed rebase.