Copy X unit properly

Refs #7860