CAAERS-7068, final fix.