solved some branch problem