2.6.1 settings change