fix a expert page bug
Merge branch 'develop'