fix behaviors
Merge branch 'develop'