Changed to thread proxy checks