fixed branch confusion