Long-polling bugfix