Trying to fix the sporadic halts in polling