Fixed thread freeze bug / multiple teams duplicate