Fixed team members not auto-assigning - #6, #9