change xs to xs_set, fixes #463