added check if xset present