Fix long-polling backup support

This fix the issue described in #89.