Improve auto-reverter