Fix issue with settings not saving