Fix the checks