Minor fix for ? problems