fixing interaction when changing teams