A fix and workaround needed for XBMC 12