Improved auto check