Minor fix & enhancement