Attempt to fix team crash issue - again