Fixed for ROOT deploy