Re: [master] Minor fix and enhancement