Fixing Poll services