fix db setting
Merge branch 'fix-database-setting'