fixed some weirdness about new branches