improve xbmc behavior