fix edit mode
Merge branch 'develop'