Kazu's rootmap fix