Minor fix for optional