fix env
fix polling