Corrected self check