Fixed Threading Issues