Corrected for static analysis errors.