Fix parent mapping