Partial fix for CP21478.