fixed polling stuff