Fix to polling controllers