Fix for CD_8196.