bugfix and decrease polling time