fix bug
merge from dev