Minor fix for single cell support