final fix for current_branch