fix some setting issue