Fixes XN bug