fixing polling