Minor fix, merge code