Fix may resolve the team saving bug. Needs further testing #13