Team city fix