First attempt at fixing the settings bug.