Fix for poll tracking