Store settings fix