Fixed the checks and data processor.