Minor fix for 5.8.9