fix check on which settings to change on
Merge commit 'e365ecce103a56bb3c1d03c31d22d6865104a1ed'