Fixed xvis issue