This should have fixed the non-FX thread issues.