Fixing first poll bug