Before long poll fix
save