Fixed issue where settings were getting unset