fixed issues caused by branching