Fixed the async thread issue, messily.