Make improvement to the check