fixed expert mode bug
Merge branch 'develop'