Tried to fix the check algorithm
Further testing with the checking...