Fixed issues when branching from branches