Fix multiple messages polling bug