Fixes delayed polling when changing directions