Rewrite cropanalyzer fix