Fix async polling for real this time. Seriously. I think