Perform a final check and shim if fails