Minor fix
Minor fix and merge