added fallback from socket to polling