fix some controller issue
merge resolve