Fix PollingTransport problems
Merge pull request #177 from dabidan/patch-1

Fix PollingTransport problems