Fixed parent handling