Team page hot fix #2