Fix for non-green checksum mismatches