Checking and fixing