Fixing issues with polling #7