fix some bugs
Merge commit '845a2739acbc38ea01da6e0ad306543054549318'