Minor fix and test.