Fix for poll