Proper fix for autowalk lag issue