Something with the polling is still broken...but it's weird