design fix
Merge branch 'hotfix/v-1.0.8'