Fixed child/parent logic