Minor fix and request unit test