fix bug from matlab side
merge
update