Fix the issue of setting values on check