Fix long polling