Fix compat with CR2.