Changed the checks for consistency