Audio Fix from CM