Fix a bug with feature branches.