branch span bug fixed