[Fix] Crash with new CVS display