Exit Team Bug Fix