Fix to Polling container

Fix to Polling container