Added more checks to parent branch finder to try to fix finish