fixed references for XS