wrong audio stream selected - tvheadend backend

Hey guys,

I been seeing a problem in xbmc for a while with multiple audio streams on different channels and wondered if this is a tvheadend problem/backend specific or something in xbmc.
the problem is when a channel has two or more audio streams, one usually being for the hard of sight. Depending on the program the normal audio can occur on either stream so depending on which one was last selected for a particular channel can result in either no audio or audio with the voice-over being selected.

I haven't seen the same problem connecting to the same backend from my android tablet using tvhguide which make me wonder did the bug is in xbmc? Does tvheadend signal which is the "primary" audio stream (eg. Which one would be chosen if I had a normal TV hooked up to my aerial)?

Cheers