NX-493: Fix root generation