Branch Name Duplicated in Checkout Directory

I am using TeamCity with the Surround plugin and it seems that no matter what path I specify, the VCS branch name is always included for a second time in the checkout path. What I would like to use is %vcsroot.My_Project_Name.branchName%\%vcsroot.My_Project_Name.repositoryPath% but what I always seem to get is Branch Name\Repository Path\Branch Name\My Project Name.

Is there any way to stop the branch name being automatically inserted a second time into the checkout directory?