Added part of the XBMC change