fix a bug on settings page
Merge